ich777/media_build
1
0
Fork 0
mirror of https://github.com/tbsdtv/media_build.git synced 2025-07-23 04:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update backport patches for kernels <6.3

Browse Source
This commit is contained in:
CrazyCat
2023-07-04 17:33:32 +03:00
parent 8855e24e31
commit a7bf9c33ba
7 changed files with 2424 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backports/backports.txt
View File

@@ -28,9 +28,14 @@ add drx39xxj.patch
add ccs.patch
add rc-cec.patch
[6.3.1023]
add v6.3_class_create.patch
add v6.3_check_endpoint.patch
[6.2.1023]
add v6.2_class.patch
add v6.2_remove.patch
add v6.2_probe.patch
add v6.2_v4l2-core.patch
[6.1.1023]
@@ -38,6 +43,7 @@ add v6.1_class.patch
add v6.1_i2c_probe.patch
add v6.1_videobuf2.patch
add v6.1_timer.patch
add v6.1_ipu3.patch
[6.0.1023]
add v6.0_i2c_remove.patch

21
backports/v6.0_i2c_remove.patch
View File

@@ -1646,6 +1646,27 @@ index 35663c10fcd9..927669cd2c16 100644
}
static int og01a1b_probe(struct i2c_client *client)
diff --git a/drivers/media/i2c/ov01a10.c b/drivers/media/i2c/ov01a10.c
index de5bc19e715b..91da0c3b73d3 100644
--- a/drivers/media/i2c/ov01a10.c
+++ b/drivers/media/i2c/ov01a10.c
@@ -898,7 +898,7 @@ static int ov01a10_identify_module(struct ov01a10 *ov01a10)
return 0;
}
-static void ov01a10_remove(struct i2c_client *client)
+static int ov01a10_remove(struct i2c_client *client)
{
struct v4l2_subdev *sd = i2c_get_clientdata(client);
@@ -907,6 +907,7 @@ static void ov01a10_remove(struct i2c_client *client)
v4l2_ctrl_handler_free(sd->ctrl_handler);
pm_runtime_disable(&client->dev);
+ return 0;
}
static int ov01a10_probe(struct i2c_client *client)
diff --git a/drivers/media/i2c/ov02a10.c b/drivers/media/i2c/ov02a10.c
index 2c1eb724d8e5..2de7e5e86325 100644
--- a/drivers/media/i2c/ov02a10.c

14
backports/v6.1_ipu3.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
index 34984a7474ed..2c9d035255d6 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1375,8 +1375,7 @@ struct sensor_async_subdev {
struct csi2_bus_info csi2;
};
-#define to_sensor_asd(__asd) \
- container_of_const(__asd, struct sensor_async_subdev, asd)
+#define to_sensor_asd(asd) container_of(asd, struct sensor_async_subdev, asd)
/* The .bound() notifier callback when a match is found */
static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,

2314
backports/v6.2_probe.patch Normal file
View File

File diff suppressed because it is too large Load Diff

42
backports/v6.3_check_endpoint.patch Normal file
View File

@@ -0,0 +1,42 @@
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index 127a3be0e0f0..8230da828d0e 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -316,16 +316,6 @@ static int usb_shark_probe(struct usb_interface *intf,
{
struct shark_device *shark;
int retval = -ENOMEM;
- static const u8 ep_addresses[] = {
- SHARK_IN_EP | USB_DIR_IN,
- SHARK_OUT_EP | USB_DIR_OUT,
- 0};
-
- /* Are the expected endpoints present? */
- if (!usb_check_int_endpoints(intf, ep_addresses)) {
- dev_err(&intf->dev, "Invalid radioSHARK device\n");
- return -EINVAL;
- }
shark = kzalloc(sizeof(struct shark_device), GFP_KERNEL);
if (!shark)
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index f1c5c0a6a335..d150f12382c6 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -282,16 +282,6 @@ static int usb_shark_probe(struct usb_interface *intf,
{
struct shark_device *shark;
int retval = -ENOMEM;
- static const u8 ep_addresses[] = {
- SHARK_IN_EP | USB_DIR_IN,
- SHARK_OUT_EP | USB_DIR_OUT,
- 0};
-
- /* Are the expected endpoints present? */
- if (!usb_check_int_endpoints(intf, ep_addresses)) {
- dev_err(&intf->dev, "Invalid radioSHARK2 device\n");
- return -EINVAL;
- }
shark = kzalloc(sizeof(struct shark_device), GFP_KERNEL);
if (!shark)

26
backports/v6.3_class_create.patch Normal file
View File

@@ -0,0 +1,26 @@
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index fb81fa46d92e..c62f795eb54e 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -1089,7 +1089,7 @@ static int __init init_dvbdev(void)
goto error;
}
- dvb_class = class_create("dvb");
+ dvb_class = class_create(THIS_MODULE, "dvb");
if (IS_ERR(dvb_class)) {
retval = PTR_ERR(dvb_class);
goto error;
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 043d23aaa3cb..25ab61dae126 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -785,7 +785,7 @@ int __init lirc_dev_init(void)
{
int retval;
- lirc_class = class_create("lirc");
+ lirc_class = class_create(THIS_MODULE, "lirc");
if (IS_ERR(lirc_class)) {
pr_err("class_create failed\n");
return PTR_ERR(lirc_class);

2
v4l/scripts/make_config_compat.pl
View File

@@ -131,7 +131,7 @@ sub check_other_dependencies()
check_files_for_func("i2c_new_scanned_device", "NEED_I2C_NEW_SCANNED_DEVICE", "include/linux/i2c.h");
check_files_for_func("i2c_new_client_device", "NEED_I2C_NEW_CLIENT_DEVICE", "include/linux/i2c.h");
check_files_for_func("i2c_client_has_driver", "NEED_I2C_CLIENT_HAS_DRIVER", "include/linux/i2c.h");
check_files_for_func("untagged_addr", "NEED_UNTAGGED_ADDR", "include/linux/mm.h");
check_files_for_func("untagged_addr", "NEED_UNTAGGED_ADDR", "include/linux/uaccess.h");
check_files_for_func("compat_ptr_ioctl", "NEED_COMPAT_PTR_IOCTL", "include/linux/fs.h");
check_files_for_func("ns_to_timespec64", "NEED_TIMESPEC64", "include/linux/time64.h");
check_files_for_func("sizeof_field", "NEED_SIZEOF_FIELD", "include/linux/stddef.h");