Merge 'partner/mirror-pa-ripcurrent-device-android13-gs-pixel-5.15' into 'partner/android13-gs-pixel-5.15

* partner/mirror-pa-ripcurrent-device-android13-gs-pixel-5.15:
  arm64/dts: add rgbp/yuvp ssmt base address
  arm64/dts: zuma: Create the PPMU device tree
  kleaf: Fix build broken by CORE_KERNEL_FRAGMENT_DEFCONFIG
  PRE_DEFCONFIG_CMDS does not write to source tree (zuma_gki & POST_DEFCONFIG_CMDS)
  build.config, kconfig and defconfig for Ripcurrent board
  arm64/dts: zuma: Add DT for Ripcurrent board
  arm64/dts: zuma: Update board_id, board_rev for Pixel
  PRE_DEFCONFIG_CMDS does not write to source tree.
  kleaf: Also build zuma_hybrid_dist.
  kleaf: Enable kleaf for zuma
  Fix build-tools path.
  arm64/dts: zuma: enable usi and pinctrl for zuma
  arm64/dts: zuma: add pinctrl dtsi for zuma
  arm64/dts: zuma: add usi dtsi for zuma
  arm64/configs: zuma_hybrid: Build virtio as a module
  build_zuma_zebu: Build modified version of GKI
  Update the path for the display external module
  Makefile.include: Update path to private/google-modules
  pinctrl: gs: Add __maybe_unused to avoid warnings
  build.config.zuma: Build as an external module
  zuma_gki.fragment: Disable signing of modules
  build_zuma_zebu.sh: use the GKI mixed build setup
  build.config.zuma: Simplify DEFCONFIG variable
  scsi: ufs: ufs-exynos: update hba suspend vops
  arm64/dts: Update LME event info in device tree
  build.config: Add LWIS to ext module
  google/debug: Define empty sjtag_is_locked() function
  arm64/dts: isp: Add PDMA block IDs in isp-fe node
  kleaf: Specify default args for --dist_dir.
  Add readme file for raviole building.
  soc: google: bcm_dbg: Use correct buffer size in sysfs read callbacks
  arm64/dts: Update irq-reg-space to 'isp-fe'
  kleaf: drop slider.mix
  kleaf: Accept --use_prebuilt_gki for P21 build.
  kleaf: add UAPI headers from external modules.
  kleaf: move kernel_images.deps to args with semantic names.
  kleaf: Move build_boot_images to build_boot and build_vendor_boot.
  kleaf: remove videobuf2-dma-sg.ko as an output
  kleaf: //build/kleaf -> //build/kernel/kleaf.
  slider_gki: enable CONFIG_VH_SCHED
  vendor_hook: sched: fix build issues with sched traces
  vendor_hook: sched: switch lockdep_assert_held to lockdep_assert_rq_held
  Update the DT include prefix path
  kleaf: run buildifier
  kleaf: remove aarch64_outs
  kleaf: fix error loading aarch64_outs
  Revert "kleaf: install test_stackinit.ko"
  arm64/dts: gs101: update setting for memory latency governor
  am64/dts: raviole: add inhibit pin
  arm64/dts: raviole: handles for WLC_RX->WLC_RX+GPIO
  arm64/dts: raviole: increase GPIO count for p9412
  aoc/alsa: dts: add dt nodes for audio capture from eraser output
  aoc/alsa: dt-bindings: add support to capture eraser output
  s2mpg10-powermeter: fixed dsm_trim value for w/a
  arm64/dts: bcl: Use maxfg FG for capacity reading
  google/debug: itmon: do not panic on specific speculative accesses
  usb: dwc3: disable dwc3 irq after gadget mode off
  arm64/dts: gs101: increase panic_count to 2
  driver: devfreq: google: Skip load calculation after resetting the load
  pcie: exynos: add spin_lock in dislink work
  drivers: devfreq: governor_simpleinteractive: really pin the timer to core0
  media: mfc: fix the error handling when alloc fail
  zram: allocate zram memory from CMA area
  pcie: exynos: add protection when dumping pcie link state
  media: mfc: clear cache flush status when cmd failure
  bcl: Disable SOFT_OCP for TPU/CPU/GPU
  arm64/dts: bcl: Disable SOFT_OCP for TPU/CPU/GPU
  arm64/dts: gs101: Modify SSMT register space in ISP DT
  tcpci_max77759: Dump TCPC registers through sysfs
  usb_psy: Expedite charging notification for non-pd DCP chargers
  arm64/dts: oriole: qresiduals for cold temp
  misc:bbd: Fix suspend/resume for the bcm_spi driver
  drivers: thermal: support HW/SW shutdown
  thermal: add backup shutdown protection
  scsi: ufs: Log the SCSI request start time for SECURITY PROTOCOL OUT
  scsi/ufs: return event count by new structure elements
  arm64/dts: gs101: add g3aa core and cmu block to pdp
  misc:bbd: fix bcm_spi_shutdown issue and add flow control
  arm64/dts: update ttf parameters
  arm64/dts: gs101: add sensor power regulator for aoc
  pcie: exynos: move OC check routine before SW reset
  soc: google: dss: add one reason for SWRESET cases
  soc: google: dss: export in_panic status
  iommu/samsung: Use pm_runtime_get_sync in fault handler
  pcie: exynos: remove recover queue_work for CPL timeout
  Revert "Revert "arm64: dts: gs101-cpu: Increase CPU frequency during suspend/resume""
  arm64/dts: update alignment parameters
  arm64/dts: Add sysreg dns in gs101-isp
  arm64/dts: updated Raven/Oriole INI data
  soc: google: dss: export in_reboot status
  misc: access_ramoops: Use memcpy_fromio()/memcpy_toio()
  Update path for the SoC project
  kleaf: install test_stackinit.ko
  slider_gki.fragment: Disable signing of modules
  Fix warnings cause by __must_check attribute
  build_slider.sh: use the GKI mixed build setup
  dma-buf: Fix build for shrinker controlled page pool
  Revert "ANDROID: dma-buf: heaps: Add a shrinker controlled page pool"
  dma-buf: Fix build for deferred-free-helper.h
  Add SPDX identifiers to Kconfig files
  Revert "ANDROID: dma-buf: heaps: Add deferred-free-helper library code"
  driver: keydebug: fix build issues and clean up
  drm: samsung: move the uapi headers out
  kbuild: add the headers_install target
  trace: remove edgetpu.h
  GKI: Fix TRACE_INCLUDE_PATH references
  Update the path for the display external module
  build.config.slider: Move UWB into EXT_MODULES
  kleaf: load the clang version from the tools
  kleaf: remove mkdtimg dependency
  kleaf: add dma-buf headers
  kleaf: switch to using kconfig_ext
  kbuild: Convert this project to an external module
  kleaf: add support for kernel_dtstree
  kleaf: copy_to_dist_dir flat=True.
  kleaf: Copy headers from ACK, not slider kernel_build.
  scsi: ufs: pixel: prevent UNIT ATTENTION for read/write
  BACKPORT: scsi: ufs: pixel: Fix dm-verity data corruption complaints
  scsi: ufs: pixel: let scsi retry to clear UNIT ATTENTION
  scsi: ufs: exynos: do not use UFSHCD_CAP_INTR_AGGR
  scsi: ufs: pixel: remove hack that ignores UNIT ATTENTION
  kleaf: move dtbos to implicit_outs
  dma-buf: heaps: move samsung-dma-heap.h under drivers/...
  tcpci_max77759: move max77759_export.h to include/linux/usb
  soc/cal-if: fix header references for external modules
  Don't copy kernel headers from GKI build.
  kleaf: add dtbo artifacts for the dtbo.img
  Revert "build.config.gs101: add DTC_FLAGS"
  build.config.slider: update DTBO support
  dts/google: update Makefile to support upstream dtbo format
  build.config.gs101: Remove DTC_OVERLAY_TEST_EXT, LIBUFDT_PREBUILTS_BIN
  kleaf: fix path for dtbs
  Remove unused kernel modules
  kleaf: update outputs to drop unused dtbos
  soc/google/cpif: fix stdarg.h header includes
  tty: serial: exynos_tty: remove duplicated definitions

Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I0f7538011871f2b3e1afec7b6ae1318f414cc77f

1 files changed, 0 insertions, 0 deletions

diff --git a/drivers/trusty/Makefile b/drivers/trusty/Kbuild
index 2cf1cfc..2cf1cfc 100644
--- a/drivers/trusty/Makefile
+++ b/drivers/trusty/Kbuild