Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed58baf authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11925): em28xx: Add support for the K-World 2800d 



Make the KWorld 2800d work properly.  In this case, that means making the
profile more generic so that it works for both the Pointnix Intra-Oral USB
camera and the KWorld device.

The device provides the audio through a pass-thru cable, so we don't need
an actual audio capture profile (neither the K-World device nor the Pointnix
have an onboard audio decoder).

Thanks to Paul Thomas for providing sample hardware.

Cc: Paul Thomas <pthomas8589@gmail.com>
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ee3436b8

Documentation/video4linux/CARDLIST.em28xx

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 16 -> Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b]

 17 -> Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]

 18 -> Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]

 19 -> PointNix Intra-Oral Camera               (em2860)

 19 -> EM2860/SAA711X Reference Design          (em2860)

 20 -> AMD ATI TV Wonder HD 600                 (em2880)        [0438:b002]

 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)        [eb1a:2801]

 22 -> Unknown EM2750/EM2751 webcam grabber     (em2750)        [eb1a:2750,eb1a:2751]

drivers/media/video/em28xx/em28xx-cards.c

+6 −5
Original line number Diff line number Diff line
@@ -1002,16 +1002,17 @@ struct em28xx_board em28xx_boards[] = { 
			.amux     = EM28XX_AMUX_LINE_IN,

		} },

	},

	[EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA] = {

		.name                = "PointNix Intra-Oral Camera",

	[EM2860_BOARD_SAA711X_REFERENCE_DESIGN] = {

		.name                = "EM2860/SAA711X Reference Design",

		.has_snapshot_button = 1,

		.tda9887_conf        = TDA9887_PRESENT,

		.tuner_type          = TUNER_ABSENT,

		.decoder             = EM28XX_SAA711X,

		.input               = { {

			.type     = EM28XX_VMUX_SVIDEO,

			.vmux     = SAA7115_SVIDEO3,

			.amux     = EM28XX_AMUX_VIDEO,

		}, {

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = SAA7115_COMPOSITE0,

		} },

	},

	[EM2880_BOARD_MSI_DIGIVOX_AD] = {
@@ -1519,7 +1520,7 @@ static struct em28xx_hash_table em28xx_eeprom_hash[] = { 
static struct em28xx_hash_table em28xx_i2c_hash[] = {

	{0xb06a32c3, EM2800_BOARD_TERRATEC_CINERGY_200, TUNER_LG_PAL_NEW_TAPC},

	{0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC},

	{0x1ba50080, EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA, TUNER_ABSENT},

	{0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT},

	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},

};

drivers/media/video/em28xx/em28xx.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950	16

#define EM2880_BOARD_PINNACLE_PCTV_HD_PRO	17

#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2	18

#define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA  19

#define EM2860_BOARD_SAA711X_REFERENCE_DESIGN	19

#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600   20

#define EM2800_BOARD_GRABBEEX_USB2800           21

#define EM2750_BOARD_UNKNOWN			  22