diff options
author | 2021-10-11 12:09:07 +0200 | |
---|---|---|
committer | 2021-10-11 12:09:08 +0200 | |
commit | 24e18b0f45c7830a74400aa599e4e3d67155ae1c (patch) | |
tree | fd2ba4e3f5f581cdbe8d265babc0053b637ed64b /include/linux | |
parent | Merge tag 'memory-controller-drv-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers (diff) | |
parent | drm/mediatek: mtk_dsi: Reset the dsi0 hardware (diff) | |
download | wireguard-linux-24e18b0f45c7830a74400aa599e4e3d67155ae1c.tar.xz wireguard-linux-24e18b0f45c7830a74400aa599e4e3d67155ae1c.zip |
Merge tag 'v5.15-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/drivers
- mt8192: add mutex support
- mmsys:
add more components
add routing table for mt8192
add reset controller support
* tag 'v5.15-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
drm/mediatek: mtk_dsi: Reset the dsi0 hardware
soc: mediatek: mmsys: Add reset controller support
soc: mediatek: add mtk mutex support for MT8192
soc: mediatek: mmsys: Add mt8192 mmsys routing table
soc: mediatek: mmsys: add comp OVL_2L2/POSTMASK/RDMA4
Link: https://lore.kernel.org/r/b1d364d0-f2ae-488b-b3f7-c694049c20d3@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/soc/mediatek/mtk-mmsys.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h index 2228bf6133da..4bba275e235a 100644 --- a/include/linux/soc/mediatek/mtk-mmsys.h +++ b/include/linux/soc/mediatek/mtk-mmsys.h @@ -29,13 +29,16 @@ enum mtk_ddp_comp_id { DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_OVL_2L1, + DDP_COMPONENT_OVL_2L2, DDP_COMPONENT_OVL1, + DDP_COMPONENT_POSTMASK0, DDP_COMPONENT_PWM0, DDP_COMPONENT_PWM1, DDP_COMPONENT_PWM2, DDP_COMPONENT_RDMA0, DDP_COMPONENT_RDMA1, DDP_COMPONENT_RDMA2, + DDP_COMPONENT_RDMA4, DDP_COMPONENT_UFOE, DDP_COMPONENT_WDMA0, DDP_COMPONENT_WDMA1, |