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

Commit 14169107 authored May 09, 2011 by Stefan Ringel Committed by Mauro Carvalho Chehab May 20, 2011

[media] tm6000: add radio capabilities



add radio capabilities

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent cecc2471

drivers/staging/tm6000/tm6000-cards.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,7 @@ struct tm6000_board tm6000_boards[] = {
		.has_zl10353 = 1,
		.has_eeprom = 1,
		.has_remote = 1,
		.has_radio = 1.
		.has_input_comp = 1,
		.has_input_svid = 1,
		},
		@@ -276,6 +277,7 @@ struct tm6000_board tm6000_boards[] = {
		.has_zl10353 = 0,
		.has_eeprom = 1,
		.has_remote = 1,
		.has_radio = 1,
		.has_input_comp = 1,
		.has_input_svid = 1,
		},
		@@ -350,6 +352,7 @@ struct tm6000_board tm6000_boards[] = {
		.has_zl10353 = 1,
		.has_eeprom = 1,
		.has_remote = 0,
		.has_radio = 1,
		.has_input_comp = 0,
		.has_input_svid = 0,
		},
		@@ -372,6 +375,7 @@ struct tm6000_board tm6000_boards[] = {
		.has_zl10353 = 0,
		.has_eeprom = 1,
		.has_remote = 0,
		.has_radio = 1,
		.has_input_comp = 0,
		.has_input_svid = 0,
		},

drivers/staging/tm6000/tm6000-video.c

+18 −16

Original line number	Diff line number	Diff line
		@@ -1730,6 +1730,7 @@ int tm6000_v4l2_register(struct tm6000_core *dev)
		printk(KERN_INFO "%s: registered device %s\n",
		dev->name, video_device_node_name(dev->vfd));

		if (dev->caps.has_radio) {
		dev->radio_dev = vdev_init(dev, &tm6000_radio_template,
		"radio");
		if (!dev->radio_dev) {
		@@ -1748,6 +1749,7 @@ int tm6000_v4l2_register(struct tm6000_core *dev)

		printk(KERN_INFO "%s: registered device %s\n",
		dev->name, video_device_node_name(dev->radio_dev));
		}

		printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret);
		return ret;

drivers/staging/tm6000/tm6000.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@ struct tm6000_capabilities {
		unsigned int has_zl10353:1;
		unsigned int has_eeprom:1;
		unsigned int has_remote:1;
		unsigned int has_radio:1;
		unsigned int has_input_comp:1;
		unsigned int has_input_svid:1;
		};