Commit 8823f028 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] rtl2832: provide muxed I2C adapter 



RTL2832 provides gated / repeater I2C adapter for tuner.
Implement it as a muxed I2C adapter.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3ca2418d

drivers/media/dvb-frontends/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ config DVB_RTL2830 


config DVB_RTL2832

	tristate "Realtek RTL2832 DVB-T"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C && I2C_MUX

	default m if !MEDIA_SUBDRV_AUTOSELECT

	help

	  Say Y when you want to support this frontend.

drivers/media/dvb-frontends/rtl2832.c

+26 −0
Original line number Diff line number Diff line
@@ -891,9 +891,29 @@ static void rtl2832_release(struct dvb_frontend *fe) 
	struct rtl2832_priv *priv = fe->demodulator_priv;



	dev_dbg(&priv->i2c->dev, "%s:\n", __func__);

	i2c_del_mux_adapter(priv->i2c_adapter);

	kfree(priv);

}



static int rtl2832_select(struct i2c_adapter *adap, void *mux_priv, u32 chan)

{

	struct rtl2832_priv *priv = mux_priv;

	return rtl2832_i2c_gate_ctrl(&priv->fe, 1);

}



static int rtl2832_deselect(struct i2c_adapter *adap, void *mux_priv, u32 chan)

{

	struct rtl2832_priv *priv = mux_priv;

	return rtl2832_i2c_gate_ctrl(&priv->fe, 0);

}



struct i2c_adapter *rtl2832_get_i2c_adapter(struct dvb_frontend *fe)

{

	struct rtl2832_priv *priv = fe->demodulator_priv;

	return priv->i2c_adapter;

}

EXPORT_SYMBOL(rtl2832_get_i2c_adapter);



struct dvb_frontend *rtl2832_attach(const struct rtl2832_config *cfg,

	struct i2c_adapter *i2c)

{
@@ -918,6 +938,12 @@ struct dvb_frontend *rtl2832_attach(const struct rtl2832_config *cfg, 
	if (ret)

		goto err;



	/* create muxed i2c adapter */

	priv->i2c_adapter = i2c_add_mux_adapter(i2c, &i2c->dev, priv, 0, 0, 0,

			rtl2832_select, rtl2832_deselect);

	if (priv->i2c_adapter == NULL)

		goto err;



	/* create dvb_frontend */

	memcpy(&priv->fe.ops, &rtl2832_ops, sizeof(struct dvb_frontend_ops));

	priv->fe.demodulator_priv = priv;

drivers/media/dvb-frontends/rtl2832.h

+13 −0
Original line number Diff line number Diff line
@@ -55,7 +55,13 @@ struct dvb_frontend *rtl2832_attach( 
	const struct rtl2832_config *cfg,

	struct i2c_adapter *i2c

);



extern struct i2c_adapter *rtl2832_get_i2c_adapter(

	struct dvb_frontend *fe

);



#else



static inline struct dvb_frontend *rtl2832_attach(

	const struct rtl2832_config *config,

	struct i2c_adapter *i2c
@@ -64,6 +70,13 @@ static inline struct dvb_frontend *rtl2832_attach( 
	pr_warn("%s: driver disabled by Kconfig\n", __func__);

	return NULL;

}



static inline struct i2c_adapter *rtl2832_get_i2c_adapter(

	struct dvb_frontend *fe

)

{

	return NULL;

}

#endif

drivers/media/dvb-frontends/rtl2832_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ 


#include "dvb_frontend.h"

#include "rtl2832.h"

#include <linux/i2c-mux.h>



struct rtl2832_priv {

	struct i2c_adapter *i2c;

	struct i2c_adapter *i2c_adapter;

	struct dvb_frontend fe;

	struct rtl2832_config cfg;