Re: [PATCH 5/8] rtl28xxu: add support for Panasonic MN88473 slave demod

[Mauro Carvalho Chehab <mchehab@osg.samsung.com>]

Em Wed, 12 Nov 2014 06:23:07 +0200
Antti Palosaari <crope@iki.fi> escreveu:

> There is RTL2832P devices having extra MN88473 demodulator. This
> patch add support for such configuration. Logically MN88473 slave
> demodulator is connected to RTL2832 master demodulator, both I2C
> bus and TS input. RTL2832 is integrated to RTL2832U and RTL2832P
> chips. Chip version RTL2832P has extra TS interface for connecting
> slave demodulator.
> 
> Signed-off-by: Antti Palosaari <crope@iki.fi>
> ---
>  drivers/media/usb/dvb-usb-v2/Kconfig    |  1 +
>  drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 31 +++++++++++++++++++++++++++++++
>  drivers/media/usb/dvb-usb-v2/rtl28xxu.h |  3 ++-
>  3 files changed, 34 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
> index 9050933..f452a11 100644
> --- a/drivers/media/usb/dvb-usb-v2/Kconfig
> +++ b/drivers/media/usb/dvb-usb-v2/Kconfig
> @@ -131,6 +131,7 @@ config DVB_USB_RTL28XXU
>  	select DVB_RTL2832
>  	select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT)
>  	select DVB_MN88472 if MEDIA_SUBDRV_AUTOSELECT
> +	select DVB_MN88473 if MEDIA_SUBDRV_AUTOSELECT
>  	select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
>  	select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
>  	select MEDIA_TUNER_MXL5005S if MEDIA_SUBDRV_AUTOSELECT


This is not a good idea, as the MN88473 is in staging.

Select is not recursive, and won't select STAGING. Also, we don't want
to enable a staging driver by default on distros.

> diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
> index e3c20f4..93f8afc 100644
> --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
> +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
> @@ -25,6 +25,7 @@
>  #include "rtl2830.h"
>  #include "rtl2832.h"
>  #include "mn88472.h"
> +#include "mn88473.h"
>  
>  #include "qt1010.h"
>  #include "mt2060.h"
> @@ -422,6 +423,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
>  	struct rtl28xxu_req req_r820t = {0x0034, CMD_I2C_RD, 1, buf};
>  	struct rtl28xxu_req req_r828d = {0x0074, CMD_I2C_RD, 1, buf};
>  	struct rtl28xxu_req req_mn88472 = {0xff38, CMD_I2C_RD, 1, buf};
> +	struct rtl28xxu_req req_mn88473 = {0xff38, CMD_I2C_RD, 1, buf};
>  
>  	dev_dbg(&d->udev->dev, "%s:\n", __func__);
>  
> @@ -567,6 +569,13 @@ tuner_found:
>  			priv->slave_demod = SLAVE_DEMOD_MN88472;
>  			goto demod_found;
>  		}
> +
> +		ret = rtl28xxu_ctrl_msg(d, &req_mn88473);
> +		if (ret == 0 && buf[0] == 0x03) {
> +			dev_dbg(&d->udev->dev, "%s: MN88473 found\n", __func__);
> +			priv->slave_demod = SLAVE_DEMOD_MN88473;
> +			goto demod_found;
> +		}
>  	}
>  
>  demod_found:
> @@ -889,6 +898,28 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
>  			}
>  
>  			priv->i2c_client_slave_demod = client;
> +		} else {
> +			struct mn88473_config mn88473_config = {};
> +
> +			mn88473_config.fe = &adap->fe[1];
> +			mn88473_config.i2c_wr_max = 22,
> +			strlcpy(info.type, "mn88473", I2C_NAME_SIZE);
> +			info.addr = 0x18;
> +			info.platform_data = &mn88473_config;
> +			request_module(info.type);
> +			client = i2c_new_device(priv->demod_i2c_adapter, &info);
> +			if (client == NULL || client->dev.driver == NULL) {
> +				priv->slave_demod = SLAVE_DEMOD_NONE;
> +				goto err_slave_demod_failed;
> +			}
> +
> +			if (!try_module_get(client->dev.driver->owner)) {
> +				i2c_unregister_device(client);
> +				priv->slave_demod = SLAVE_DEMOD_NONE;
> +				goto err_slave_demod_failed;
> +			}
> +
> +			priv->i2c_client_slave_demod = client;
>  		}
>  
>  		/* override init as we want configure RTL2832 as TS input */
> diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
> index 58f2730..9c059ac 100644
> --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
> +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
> @@ -62,7 +62,8 @@ struct rtl28xxu_priv {
>  	int (*init)(struct dvb_frontend *fe);
>  	#define SLAVE_DEMOD_NONE           0
>  	#define SLAVE_DEMOD_MN88472        1
> -	unsigned int slave_demod:1;
> +	#define SLAVE_DEMOD_MN88473        2
> +	unsigned int slave_demod:2;
>  };
>  
>  enum rtl28xxu_chip_id {