Merge commit 'fbdb94a0c7bddcf16d5e01588e5d0aed65ae43f2'

* commit 'fbdb94a0c7bddcf16d5e01588e5d0aed65ae43f2': (40 commits)
  hwspinlock: rockchip: Add maximum user count config
  dt-bindings: hwlock: rockchip: Add the maximum user count property
  mailbox: rockchip: add get properties helper
  mailbox: rockchip: add version and lock register support
  arm64: dts: rockchip: rv1126b-evb: Add the regulator-settling-time-up-us configuration
  power: supply: sc89601_charger: fix the abnormal display of the charging icon
  arm64: dts: rockchip: add Tablet Board devicetree for RK3576S-RK809
  arm64: dts: rockchip: rv1126b: Fix compatible for can node
  arm64: dts: rockchip: rk3576: Fix compatible for can node
  ARM: dts: rockchip: rk3506: Fix compatible for can node
  arm64: configs: rockchip_linux_defconfig enable CONFIG_CAN_RK3576
  net: can: rockchip: rename rk3576_canfd.c to rk3576_can.c
  drm/rockchip: dw-dp: support more feature active protocol converter adapters
  media: rockchip: vicap force update buffer addr when init stream
  media: rockchip: vicap change stop dma to fs for dvp
  media: rockchip: vicap fixes error of stop stream with dvp
  media: rockchip: vicap fixes error info of fps with toisp mode
  iio: imu: add inv icm42607 support
  arm64: dts: rockchip: rv1126b-evb2: Add the rk96x_wake_aov_irq driver's dts.
  spi: rockchip-sfc: Wait for thunder boot DMA status change before rockchip_sfc_get_gpio_descs
  ...

Change-Id: I21a5ce10a4a9f5c23e607ac2b2ee51c80659aa88
This commit is contained in:
Tao Huang
2025-10-11 18:54:37 +08:00
93 changed files with 8692 additions and 772 deletions

View File

@@ -7,6 +7,7 @@
#ifndef _UAPI_RK_HDMIRX_CONFIG_H
#define _UAPI_RK_HDMIRX_CONFIG_H
#include <drm/drm_mode.h>
#include <linux/types.h>
#include <linux/v4l2-controls.h>
@@ -119,6 +120,15 @@ enum user_color_range {
#define RK_HDMIRX_CMD_SET_EDID_VERSION \
_IOW('V', BASE_VIDIOC_PRIVATE + 17, int)
#define RK_HDMIRX_CMD_GET_HDR_METADATA \
_IOR('V', BASE_VIDIOC_PRIVATE + 18, struct hdr_metadata_infoframe)
#define RK_HDMIRX_CMD_GET_OUTPUT_COLOR_RANGE \
_IOR('V', BASE_VIDIOC_PRIVATE + 19, int)
#define RK_HDMIRX_CMD_GET_OUTPUT_COLOR_SPACE \
_IOR('V', BASE_VIDIOC_PRIVATE + 20, int)
/* Private v4l2 event */
#define RK_HDMIRX_V4L2_EVENT_SIGNAL_LOST \
(V4L2_EVENT_PRIVATE_START + 1)