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

Commit 133bc4e4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx231xx, em28xx: pass media_device to si2157 



As si2157 doesn't use the subdev, but has instead a binding
logic that doesn't have any core framework, we need to manually
pass the media_device struct via platform data on every place
it is called.

This fixes support for HVR-955Q when MC is enabled.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8b0a81c7

drivers/media/usb/cx231xx/cx231xx-dvb.c

+6 −0
Original line number Diff line number Diff line
@@ -801,6 +801,9 @@ static int dvb_init(struct cx231xx *dev) 
		/* attach tuner */

		memset(&si2157_config, 0, sizeof(si2157_config));

		si2157_config.fe = dev->dvb->frontend;

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

		si2157_config.mdev = dev->media_dev;

#endif

		si2157_config.if_port = 1;

		si2157_config.inversion = true;

		strlcpy(info.type, "si2157", I2C_NAME_SIZE);
@@ -857,6 +860,9 @@ static int dvb_init(struct cx231xx *dev) 
		/* attach tuner */

		memset(&si2157_config, 0, sizeof(si2157_config));

		si2157_config.fe = dev->dvb->frontend;

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

		si2157_config.mdev = dev->media_dev;

#endif

		si2157_config.if_port = 1;

		si2157_config.inversion = true;

		strlcpy(info.type, "si2157", I2C_NAME_SIZE);

drivers/media/usb/em28xx/em28xx-dvb.c

+6 −0
Original line number Diff line number Diff line
@@ -1671,6 +1671,9 @@ static int em28xx_dvb_init(struct em28xx *dev) 
			memset(&si2157_config, 0, sizeof(si2157_config));

			si2157_config.fe = dvb->fe[0];

			si2157_config.if_port = 1;

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

			si2157_config.mdev = dev->media_dev;

#endif

			memset(&info, 0, sizeof(struct i2c_board_info));

			strlcpy(info.type, "si2157", I2C_NAME_SIZE);

			info.addr = 0x60;
@@ -1732,6 +1735,9 @@ static int em28xx_dvb_init(struct em28xx *dev) 
			memset(&si2157_config, 0, sizeof(si2157_config));

			si2157_config.fe = dvb->fe[0];

			si2157_config.if_port = 0;

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

			si2157_config.mdev = dev->media_dev;

#endif

			memset(&info, 0, sizeof(struct i2c_board_info));

			strlcpy(info.type, "si2146", I2C_NAME_SIZE);

			info.addr = 0x60;