forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/media/i2c/saa7115.c
....@@ -59,10 +59,16 @@
5959 SAA7118,
6060 };
6161
62
+enum saa711x_pads {
63
+ SAA711X_PAD_IF_INPUT,
64
+ SAA711X_PAD_VID_OUT,
65
+ SAA711X_NUM_PADS
66
+};
67
+
6268 struct saa711x_state {
6369 struct v4l2_subdev sd;
6470 #ifdef CONFIG_MEDIA_CONTROLLER
65
- struct media_pad pads[DEMOD_NUM_PADS];
71
+ struct media_pad pads[SAA711X_NUM_PADS];
6672 #endif
6773 struct v4l2_ctrl_handler hdl;
6874
....@@ -1760,12 +1766,12 @@
17601766 * exists. However, tests on a device labeled as:
17611767 * "GM7113C 1145" returned "10" on all 16 chip
17621768 * version (reg 0x00) reads. So, we need to also
1763
- * accept at least verion 0. For now, let's just
1769
+ * accept at least version 0. For now, let's just
17641770 * assume that a device that returns "0000" for
17651771 * the lower nibble is a gm7113c.
17661772 */
17671773
1768
- strlcpy(name, "gm7113c", CHIP_VER_SIZE);
1774
+ strscpy(name, "gm7113c", CHIP_VER_SIZE);
17691775
17701776 if (!autodetect && strcmp(name, id->name))
17711777 return -EINVAL;
....@@ -1779,7 +1785,7 @@
17791785
17801786 /* Check if it is a CJC7113 */
17811787 if (!memcmp(name, "1111111111111111", CHIP_VER_SIZE)) {
1782
- strlcpy(name, "cjc7113", CHIP_VER_SIZE);
1788
+ strscpy(name, "cjc7113", CHIP_VER_SIZE);
17831789
17841790 if (!autodetect && strcmp(name, id->name))
17851791 return -EINVAL;
....@@ -1825,7 +1831,7 @@
18251831 if (ident < 0)
18261832 return ident;
18271833
1828
- strlcpy(client->name, name, sizeof(client->name));
1834
+ strscpy(client->name, name, sizeof(client->name));
18291835
18301836 state = devm_kzalloc(&client->dev, sizeof(*state), GFP_KERNEL);
18311837 if (state == NULL)
....@@ -1834,13 +1840,15 @@
18341840 v4l2_i2c_subdev_init(sd, client, &saa711x_ops);
18351841
18361842 #if defined(CONFIG_MEDIA_CONTROLLER)
1837
- state->pads[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
1838
- state->pads[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
1839
- state->pads[DEMOD_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;
1843
+ state->pads[SAA711X_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
1844
+ state->pads[SAA711X_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
1845
+ state->pads[SAA711X_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
1846
+ state->pads[SAA711X_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV;
18401847
18411848 sd->entity.function = MEDIA_ENT_F_ATV_DECODER;
18421849
1843
- ret = media_entity_pads_init(&sd->entity, DEMOD_NUM_PADS, state->pads);
1850
+ ret = media_entity_pads_init(&sd->entity, SAA711X_NUM_PADS,
1851
+ state->pads);
18441852 if (ret < 0)
18451853 return ret;
18461854 #endif