Skip to content

L
linux
Commit 33001010 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files
Options

[media] tveeprom: remove v4l2-chip-ident.h include 

Replace the V4L2_IDENT_* usage with tveeprom-specific defines. This header
is deprecated, so those defines shouldn't be used anymore.
The em28xx driver is the only one that uses the tveeprom audio_processor
field, so that has been updated to use the new tveeprom AUDPROC define.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7486af1a
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 78 deletions
drivers/media/common/tveeprom.c
View file @ 33001010
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <media/tuner.h> #include <media/tuner.h>
#include <media/tveeprom.h> #include <media/tveeprom.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h>
MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver"); MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
MODULE_AUTHOR("John Klar"); MODULE_AUTHOR("John Klar");
...@@ -67,13 +66,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); ...@@ -67,13 +66,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
* The Hauppauge eeprom uses an 8bit field to determine which * The Hauppauge eeprom uses an 8bit field to determine which
* tuner formats the tuner supports. * tuner formats the tuner supports.
*/ */
static struct HAUPPAUGE_TUNER_FMT static const struct {
{
int id; int id;
char *name; const char * const name;
} } hauppauge_tuner_fmt[] = {
hauppauge_tuner_fmt[] =
{
{ V4L2_STD_UNKNOWN, " UNKNOWN" }, { V4L2_STD_UNKNOWN, " UNKNOWN" },
{ V4L2_STD_UNKNOWN, " FM" }, { V4L2_STD_UNKNOWN, " FM" },
{ V4L2_STD_B|V4L2_STD_GH, " PAL(B/G)" }, { V4L2_STD_B|V4L2_STD_GH, " PAL(B/G)" },
...@@ -88,13 +84,10 @@ hauppauge_tuner_fmt[] = ...@@ -88,13 +84,10 @@ hauppauge_tuner_fmt[] =
supplying this information. Note that many tuners where only used for supplying this information. Note that many tuners where only used for
testing and never made it to the outside world. So you will only see testing and never made it to the outside world. So you will only see
a subset in actual produced cards. */ a subset in actual produced cards. */
static struct HAUPPAUGE_TUNER static const struct {
{
int id; int id;
char *name; const char * const name;
} } hauppauge_tuner[] = {
hauppauge_tuner[] =
{
/* 0-9 */ /* 0-9 */
{ TUNER_ABSENT, "None" }, { TUNER_ABSENT, "None" },
{ TUNER_ABSENT, "External" }, { TUNER_ABSENT, "External" },
...@@ -298,69 +291,66 @@ hauppauge_tuner[] = ...@@ -298,69 +291,66 @@ hauppauge_tuner[] =
{ TUNER_ABSENT, "NXP 18272S"}, { TUNER_ABSENT, "NXP 18272S"},
}; };
/* Use V4L2_IDENT_AMBIGUOUS for those audio 'chips' that are /* Use TVEEPROM_AUDPROC_INTERNAL for those audio 'chips' that are
* internal to a video chip, i.e. not a separate audio chip. */ * internal to a video chip, i.e. not a separate audio chip. */
static struct HAUPPAUGE_AUDIOIC static const struct {
{
u32 id; u32 id;
char *name; const char * const name;
} } audio_ic[] = {
audioIC[] =
{
/* 0-4 */ /* 0-4 */
{ V4L2_IDENT_NONE, "None" }, { TVEEPROM_AUDPROC_NONE, "None" },
{ V4L2_IDENT_UNKNOWN, "TEA6300" }, { TVEEPROM_AUDPROC_OTHER, "TEA6300" },
{ V4L2_IDENT_UNKNOWN, "TEA6320" }, { TVEEPROM_AUDPROC_OTHER, "TEA6320" },
{ V4L2_IDENT_UNKNOWN, "TDA9850" }, { TVEEPROM_AUDPROC_OTHER, "TDA9850" },
{ V4L2_IDENT_MSPX4XX, "MSP3400C" }, { TVEEPROM_AUDPROC_MSP, "MSP3400C" },
/* 5-9 */ /* 5-9 */
{ V4L2_IDENT_MSPX4XX, "MSP3410D" }, { TVEEPROM_AUDPROC_MSP, "MSP3410D" },
{ V4L2_IDENT_MSPX4XX, "MSP3415" }, { TVEEPROM_AUDPROC_MSP, "MSP3415" },
{ V4L2_IDENT_MSPX4XX, "MSP3430" }, { TVEEPROM_AUDPROC_MSP, "MSP3430" },
{ V4L2_IDENT_MSPX4XX, "MSP3438" }, { TVEEPROM_AUDPROC_MSP, "MSP3438" },
{ V4L2_IDENT_UNKNOWN, "CS5331" }, { TVEEPROM_AUDPROC_OTHER, "CS5331" },
/* 10-14 */ /* 10-14 */
{ V4L2_IDENT_MSPX4XX, "MSP3435" }, { TVEEPROM_AUDPROC_MSP, "MSP3435" },
{ V4L2_IDENT_MSPX4XX, "MSP3440" }, { TVEEPROM_AUDPROC_MSP, "MSP3440" },
{ V4L2_IDENT_MSPX4XX, "MSP3445" }, { TVEEPROM_AUDPROC_MSP, "MSP3445" },
{ V4L2_IDENT_MSPX4XX, "MSP3411" }, { TVEEPROM_AUDPROC_MSP, "MSP3411" },
{ V4L2_IDENT_MSPX4XX, "MSP3416" }, { TVEEPROM_AUDPROC_MSP, "MSP3416" },
/* 15-19 */ /* 15-19 */
{ V4L2_IDENT_MSPX4XX, "MSP3425" }, { TVEEPROM_AUDPROC_MSP, "MSP3425" },
{ V4L2_IDENT_MSPX4XX, "MSP3451" }, { TVEEPROM_AUDPROC_MSP, "MSP3451" },
{ V4L2_IDENT_MSPX4XX, "MSP3418" }, { TVEEPROM_AUDPROC_MSP, "MSP3418" },
{ V4L2_IDENT_UNKNOWN, "Type 0x12" }, { TVEEPROM_AUDPROC_OTHER, "Type 0x12" },
{ V4L2_IDENT_UNKNOWN, "OKI7716" }, { TVEEPROM_AUDPROC_OTHER, "OKI7716" },
/* 20-24 */ /* 20-24 */
{ V4L2_IDENT_MSPX4XX, "MSP4410" }, { TVEEPROM_AUDPROC_MSP, "MSP4410" },
{ V4L2_IDENT_MSPX4XX, "MSP4420" }, { TVEEPROM_AUDPROC_MSP, "MSP4420" },
{ V4L2_IDENT_MSPX4XX, "MSP4440" }, { TVEEPROM_AUDPROC_MSP, "MSP4440" },
{ V4L2_IDENT_MSPX4XX, "MSP4450" }, { TVEEPROM_AUDPROC_MSP, "MSP4450" },
{ V4L2_IDENT_MSPX4XX, "MSP4408" }, { TVEEPROM_AUDPROC_MSP, "MSP4408" },
/* 25-29 */ /* 25-29 */
{ V4L2_IDENT_MSPX4XX, "MSP4418" }, { TVEEPROM_AUDPROC_MSP, "MSP4418" },
{ V4L2_IDENT_MSPX4XX, "MSP4428" }, { TVEEPROM_AUDPROC_MSP, "MSP4428" },
{ V4L2_IDENT_MSPX4XX, "MSP4448" }, { TVEEPROM_AUDPROC_MSP, "MSP4448" },
{ V4L2_IDENT_MSPX4XX, "MSP4458" }, { TVEEPROM_AUDPROC_MSP, "MSP4458" },
{ V4L2_IDENT_MSPX4XX, "Type 0x1d" }, { TVEEPROM_AUDPROC_MSP, "Type 0x1d" },
/* 30-34 */ /* 30-34 */
{ V4L2_IDENT_AMBIGUOUS, "CX880" }, { TVEEPROM_AUDPROC_INTERNAL, "CX880" },
{ V4L2_IDENT_AMBIGUOUS, "CX881" }, { TVEEPROM_AUDPROC_INTERNAL, "CX881" },
{ V4L2_IDENT_AMBIGUOUS, "CX883" }, { TVEEPROM_AUDPROC_INTERNAL, "CX883" },
{ V4L2_IDENT_AMBIGUOUS, "CX882" }, { TVEEPROM_AUDPROC_INTERNAL, "CX882" },
{ V4L2_IDENT_AMBIGUOUS, "CX25840" }, { TVEEPROM_AUDPROC_INTERNAL, "CX25840" },
/* 35-39 */ /* 35-39 */
{ V4L2_IDENT_AMBIGUOUS, "CX25841" }, { TVEEPROM_AUDPROC_INTERNAL, "CX25841" },
{ V4L2_IDENT_AMBIGUOUS, "CX25842" }, { TVEEPROM_AUDPROC_INTERNAL, "CX25842" },
{ V4L2_IDENT_AMBIGUOUS, "CX25843" }, { TVEEPROM_AUDPROC_INTERNAL, "CX25843" },
{ V4L2_IDENT_AMBIGUOUS, "CX23418" }, { TVEEPROM_AUDPROC_INTERNAL, "CX23418" },
{ V4L2_IDENT_AMBIGUOUS, "CX23885" }, { TVEEPROM_AUDPROC_INTERNAL, "CX23885" },
/* 40-44 */ /* 40-44 */
{ V4L2_IDENT_AMBIGUOUS, "CX23888" }, { TVEEPROM_AUDPROC_INTERNAL, "CX23888" },
{ V4L2_IDENT_AMBIGUOUS, "SAA7131" }, { TVEEPROM_AUDPROC_INTERNAL, "SAA7131" },
{ V4L2_IDENT_AMBIGUOUS, "CX23887" }, { TVEEPROM_AUDPROC_INTERNAL, "CX23887" },
{ V4L2_IDENT_AMBIGUOUS, "SAA7164" }, { TVEEPROM_AUDPROC_INTERNAL, "SAA7164" },
{ V4L2_IDENT_AMBIGUOUS, "AU8522" }, { TVEEPROM_AUDPROC_INTERNAL, "AU8522" },
}; };
/* This list is supplied by Hauppauge. Thanks! */ /* This list is supplied by Hauppauge. Thanks! */
...@@ -453,11 +443,11 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, ...@@ -453,11 +443,11 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
int i, j, len, done, beenhere, tag, start; int i, j, len, done, beenhere, tag, start;
int tuner1 = 0, t_format1 = 0, audioic = -1; int tuner1 = 0, t_format1 = 0, audioic = -1;
char *t_name1 = NULL; const char *t_name1 = NULL;
const char *t_fmt_name1[8] = { " none", "", "", "", "", "", "", "" }; const char *t_fmt_name1[8] = { " none", "", "", "", "", "", "", "" };
int tuner2 = 0, t_format2 = 0; int tuner2 = 0, t_format2 = 0;
char *t_name2 = NULL; const char *t_name2 = NULL;
const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" }; const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
memset(tvee, 0, sizeof(*tvee)); memset(tvee, 0, sizeof(*tvee));
...@@ -545,10 +535,10 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, ...@@ -545,10 +535,10 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
to indicate 4052 mux was removed in favor of using MSP to indicate 4052 mux was removed in favor of using MSP
inputs directly. */ inputs directly. */
audioic = eeprom_data[i+2] & 0x7f; audioic = eeprom_data[i+2] & 0x7f;
if (audioic < ARRAY_SIZE(audioIC)) if (audioic < ARRAY_SIZE(audio_ic))
tvee->audio_processor = audioIC[audioic].id; tvee->audio_processor = audio_ic[audioic].id;
else else
tvee->audio_processor = V4L2_IDENT_UNKNOWN; tvee->audio_processor = TVEEPROM_AUDPROC_OTHER;
break; break;
/* case 0x03: tag 'EEInfo' */ /* case 0x03: tag 'EEInfo' */
...@@ -578,10 +568,10 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, ...@@ -578,10 +568,10 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
to indicate 4052 mux was removed in favor of using MSP to indicate 4052 mux was removed in favor of using MSP
inputs directly. */ inputs directly. */
audioic = eeprom_data[i+1] & 0x7f; audioic = eeprom_data[i+1] & 0x7f;
if (audioic < ARRAY_SIZE(audioIC)) if (audioic < ARRAY_SIZE(audio_ic))
tvee->audio_processor = audioIC[audioic].id; tvee->audio_processor = audio_ic[audioic].id;
else else
tvee->audio_processor = V4L2_IDENT_UNKNOWN; tvee->audio_processor = TVEEPROM_AUDPROC_OTHER;
break; break;
...@@ -726,11 +716,11 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, ...@@ -726,11 +716,11 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
t_fmt_name2[6], t_fmt_name2[7], t_format2); t_fmt_name2[6], t_fmt_name2[7], t_format2);
if (audioic < 0) { if (audioic < 0) {
tveeprom_info("audio processor is unknown (no idx)\n"); tveeprom_info("audio processor is unknown (no idx)\n");
tvee->audio_processor = V4L2_IDENT_UNKNOWN; tvee->audio_processor = TVEEPROM_AUDPROC_OTHER;
} else { } else {
if (audioic < ARRAY_SIZE(audioIC)) if (audioic < ARRAY_SIZE(audio_ic))
tveeprom_info("audio processor is %s (idx %d)\n", tveeprom_info("audio processor is %s (idx %d)\n",
audioIC[audioic].name, audioic); audio_ic[audioic].name, audioic);
else else
tveeprom_info("audio processor is unknown (idx %d)\n", tveeprom_info("audio processor is unknown (idx %d)\n",
audioic); audioic);
......
drivers/media/usb/em28xx/em28xx-cards.c
View file @ 33001010
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <media/i2c-addr.h> #include <media/i2c-addr.h>
#include <media/tveeprom.h> #include <media/tveeprom.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h>
#include "em28xx.h" #include "em28xx.h"
...@@ -2669,7 +2668,7 @@ static void em28xx_card_setup(struct em28xx *dev) ...@@ -2669,7 +2668,7 @@ static void em28xx_card_setup(struct em28xx *dev)
dev->tuner_type = tv.tuner_type; dev->tuner_type = tv.tuner_type;
if (tv.audio_processor == V4L2_IDENT_MSPX4XX) { if (tv.audio_processor == TVEEPROM_AUDPROC_MSP) {
dev->i2s_speed = 2048000; dev->i2s_speed = 2048000;
dev->board.has_msp34xx = 1; dev->board.has_msp34xx = 1;
} }
......
include/media/tveeprom.h
View file @ 33001010
/* /*
*/ */
enum tveeprom_audio_processor {
/* No audio processor present */
TVEEPROM_AUDPROC_NONE,
/* The audio processor is internal to the video processor */
TVEEPROM_AUDPROC_INTERNAL,
/* The audio processor is a MSPXXXX device */
TVEEPROM_AUDPROC_MSP,
/* The audio processor is another device */
TVEEPROM_AUDPROC_OTHER,
};
struct tveeprom { struct tveeprom {
u32 has_radio; u32 has_radio;
/* If has_ir == 0, then it is unknown what the IR capabilities are, /* If has_ir == 0, then it is unknown what the IR capabilities are,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7