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

Commit d25a4cbb authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Archit Taneja
Browse files

drm/bridge: adv7511: add support for the 2nd chip 



The Renesas Wheat board has 2 ADV7513 chips on the same I2C bus, however
the ADV751x driver only supports 1 chip as it tries to assign the packet/
EDID/CEC memory I2C devices to the fixed I2C addresses. Assign these I2C
addresses at the fixed offsets (derived from the programming guide) from
the main register map address instead.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1580212.O1LYdJFM97@wasted.cogentembedded.com
parent dec90ea1

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+6 −6
Original line number Diff line number Diff line
@@ -922,15 +922,13 @@ static int adv7511_parse_dt(struct device_node *np, 
	return 0;

}



static const int edid_i2c_addr = 0x7e;

static const int packet_i2c_addr = 0x70;

static const int cec_i2c_addr = 0x78;



static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)

{

	struct adv7511_link_config link_config;

	struct adv7511 *adv7511;

	struct device *dev = &i2c->dev;

	unsigned int main_i2c_addr = i2c->addr << 1;

	unsigned int edid_i2c_addr = main_i2c_addr + 4;

	unsigned int val;

	int ret;
@@ -991,8 +989,10 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 


	regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, edid_i2c_addr);

	regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR,

		     packet_i2c_addr);

	regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, cec_i2c_addr);

		     main_i2c_addr - 0xa);

	regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR,

		     main_i2c_addr - 2);



	adv7511_packet_disable(adv7511, 0xffff);



	adv7511->i2c_main = i2c;

drivers/gpu/drm/bridge/adv7511/adv7533.c

+2 −3
Original line number Diff line number Diff line
@@ -149,13 +149,12 @@ void adv7533_uninit_cec(struct adv7511 *adv) 
	i2c_unregister_device(adv->i2c_cec);

}



static const int cec_i2c_addr = 0x78;



int adv7533_init_cec(struct adv7511 *adv)

{

	int ret;



	adv->i2c_cec = i2c_new_dummy(adv->i2c_main->adapter, cec_i2c_addr >> 1);

	adv->i2c_cec = i2c_new_dummy(adv->i2c_main->adapter,

				     adv->i2c_main->addr - 1);

	if (!adv->i2c_cec)

		return -ENOMEM;