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

Commit 2ad8dd41 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] smipcie: switch ts2022 to ts2020 driver 



Change ts2022 driver to ts2020 driver. ts2020 driver supports
both tuner chip models.

Cc: Nibble Max <nibble.max@gmail.com>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d76e0878

drivers/media/pci/smipcie/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config DVB_SMIPCIE 
	select I2C_ALGOBIT

	select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT

	select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT

	select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT

	select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT

	select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT

	select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT

	help

drivers/media/pci/smipcie/smipcie.c

+5 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include "smipcie.h"

#include "m88ds3103.h"

#include "m88ts2022.h"

#include "ts2020.h"

#include "m88rs6000t.h"

#include "si2168.h"

#include "si2157.h"
@@ -532,9 +532,7 @@ static int smi_dvbsky_m88ds3103_fe_attach(struct smi_port *port) 
	struct i2c_adapter *tuner_i2c_adapter;

	struct i2c_client *tuner_client;

	struct i2c_board_info tuner_info;

	struct m88ts2022_config m88ts2022_config = {

		.clock = 27000000,

	};

	struct ts2020_config ts2020_config = {};

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

	i2c = (port->idx == 0) ? &dev->i2c_bus[0] : &dev->i2c_bus[1];
@@ -546,10 +544,10 @@ static int smi_dvbsky_m88ds3103_fe_attach(struct smi_port *port) 
		return ret;

	}

	/* attach tuner */

	m88ts2022_config.fe = port->fe;

	strlcpy(tuner_info.type, "m88ts2022", I2C_NAME_SIZE);

	ts2020_config.fe = port->fe;

	strlcpy(tuner_info.type, "ts2020", I2C_NAME_SIZE);

	tuner_info.addr = 0x60;

	tuner_info.platform_data = &m88ts2022_config;

	tuner_info.platform_data = &ts2020_config;

	tuner_client = smi_add_i2c_client(tuner_i2c_adapter, &tuner_info);

	if (!tuner_client) {

		ret = -ENODEV;