Merge commit '5e22e51d33663d348ddccef3a001177b43613cc0'

* commit '5e22e51d33663d348ddccef3a001177b43613cc0':
  input: touchscreen: gt9xx: Fix compilation errors on kernel 6.1
  media: i2c: add s5k3l8xx sensor driver
  drm/rockchip: dw-dp: select DRM_DISPLAY_HDMI_HELPER

Change-Id: I18eb212d52ef0f42e7fd9f26f099570b38678645

drivers/gpu/drm/rockchip/Kconfig

@@ -108,6 +108,7 @@ config ROCKCHIP_DW_MIPI_DSI
 config ROCKCHIP_DW_DP
 	bool "Rockchip specific extensions for Synopsys DW DPTX"
 	select DRM_DISPLAY_HDCP_HELPER
+	select DRM_DISPLAY_HDMI_HELPER
 	help
 	  Choose this option for Synopsys DesignWare Cores DisplayPort
 	  transmit controller support on Rockchip SoC.

drivers/input/touchscreen/gt9xx/gt9xx_update.c

@@ -101,7 +101,9 @@ typedef struct
     struct file *file; 
     struct file *cfg_file;
     st_fw_head  ic_fw_msg;
+#if 0
     mm_segment_t old_fs;
+#endif
     u32 fw_total_len;
     u32 fw_burned_len;
 }st_update_msg;
@@ -3445,8 +3447,10 @@ static s32 gup_prepare_fl_fw(char *path, st_fw_head *fw_head)
         return FAIL;
     }
     
+#if 0
     update_msg.old_fs = get_fs();
     set_fs(KERNEL_DS);
+#endif
     
     update_msg.file->f_op->llseek(update_msg.file, 0, SEEK_SET);
     update_msg.fw_total_len = update_msg.file->f_op->llseek(update_msg.file, 0, SEEK_END);
@@ -3460,7 +3464,9 @@ static s32 gup_prepare_fl_fw(char *path, st_fw_head *fw_head)
 				  (unsigned int)sizeof(gtp_default_FW_fl) / 1024,
 				  update_msg.fw_total_len,
 				  update_msg.fw_total_len / 1024);
+#if 0
         set_fs(update_msg.old_fs);
+#endif
         _CLOSE_FILE(update_msg.file);
         return FAIL;
     }
@@ -3472,7 +3478,9 @@ static s32 gup_prepare_fl_fw(char *path, st_fw_head *fw_head)
     ret = update_msg.file->f_op->read(update_msg.file, (char*)gtp_default_FW_fl, 
                              update_msg.fw_total_len + FW_HEAD_LENGTH,
                                 &update_msg.file->f_pos);
+#if 0
     set_fs(update_msg.old_fs);
+#endif
     _CLOSE_FILE(update_msg.file);
     
     if (ret < 0)

drivers/media/i2c/Kconfig

@@ -1617,6 +1617,15 @@ config VIDEO_S5K3L6XX
 	  This is a Video4Linux2 sensor driver for the Samsung
 	  S5K3L6XX camera.
 
+config VIDEO_S5K3L8XX
+	tristate "Samsung S5K3L8XX sensor support"
+	depends on I2C && VIDEO_DEV
+	depends on MEDIA_CAMERA_SUPPORT
+	select V4L2_FWNODE
+	help
+	  This is a Video4Linux2 sensor driver for the Samsung
+	  S5K3L8XX camera.
+
 config VIDEO_S5K4ECGX
 	tristate "Samsung S5K4ECGX sensor support"
 	depends on I2C && VIDEO_DEV

drivers/media/i2c/Makefile

@@ -205,6 +205,7 @@ obj-$(CONFIG_VIDEO_RK_IRCUT) += rk_ircut.o
 obj-$(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP)	+= cam-tb-setup.o
 obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/
 obj-$(CONFIG_VIDEO_S5K3L6XX) += s5k3l6xx.o
+obj-$(CONFIG_VIDEO_S5K3L8XX) += s5k3l8xx.o
 obj-$(CONFIG_VIDEO_S5K4ECGX) += s5k4ecgx.o
 obj-$(CONFIG_VIDEO_S5K5BAF) += s5k5baf.o
 obj-$(CONFIG_VIDEO_S5K6A3) += s5k6a3.o