summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLCPD Auto Merger <lcpd_integration@list.ti.com>2022-11-05 04:31:16 -0500
committerLCPD Auto Merger <lcpd_integration@list.ti.com>2022-11-05 04:31:16 -0500
commit95a1aa770323b43674362fde91d6935fb4ef9252 (patch)
tree7ada7e2a8e04b637ac8a23a363f328afb8b60301 /MAINTAINERS
parent92185818dbd94413c8acf5c974f675ed51331f88 (diff)
parentd56e9c7d41c8bb63cbec434337d8e4b7c1b20206 (diff)
Merged TI feature multimedia into ti-linux-5.10.y-cicd
TI-Feature: multimedia TI-Branch: multimedia-ti-linux-5.10.y * 'multimedia-ti-linux-5.10.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/multimedia: vxe-vxd: encoder: Buffer Alignment fix with 4k page size arm64: dts: ti: k3-j784s4-main: Add video codec nodes media: platform: Updating config to build CnM Wave5 VPU chips-media: wave5: Fix typo for encoder parameter chips-media: wave5: Fix typo for Internal buffer formula. staging: media: wave5: vpu: Include io.h media: chips-media: wave5: Add wave5 driver to maintainers file dt-bindings: media: wave5: add yaml devicetree bindings media: chips-media: wave5: Add TODO file media: chips-media: wave5: Add the v4l2 layer media: chips-media: wave5: Add the vdi layer media: chips-media: wave5: Add vpuapi layer Revert "staging: media: wave5: Add the vdi layer" Revert "staging: media: wave5: Add vpuapi layer" Revert "staging: media: wave5: Add TODO file" Revert "staging: media: wave5: Add the v4l2 layer" Revert "dt-bindings: media: staging: wave5: add yaml devicetree bindings" Revert "media: wave5: Add wave5 driver to maintainers file" Revert "staging: media: wave5: vpu: Include io.h" Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7029ca6faa95..1106e9d6a3bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18928,11 +18928,11 @@ F: include/uapi/linux/watchdog.h
WAVE5 VPU CODEC DRIVER
M: Nas Chung <nas.chung@chipsnmedia.com>
M: Robert Beckett <bob.beckett@collabora.com>
-M: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
+M: Sebastian Fricke <sebastian.fricke@collabora.com>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/staging/media/cnm,wave.yaml
-F: drivers/staging/media/wave5/
+F: drivers/media/platform/chips-media/wave5/
WHISKEYCOVE PMIC GPIO DRIVER
M: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>