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

Commit a68ee76f authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Archit Taneja
Browse files

drm/bridge: megachips-stdpxxxx-ge-b850v3-fw: Fix bridge initialization 



Reordering of the device nodes based on unit address resulted in
ge_b850v3_lvds_attach() being called before
ge_b850v3_lvds_ptr->stdp4028_i2c was populated.

This patch moves the drm bridge initialization from
ge_b850v3_lvds_init() to stdp4028_ge_b850v3_fw_probe() ensuring that
ge_b850v3_lvds_ptr->stdp4028_i2c is properly populated.

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330081928.8537-1-peter.senna@collabora.com
parent 50021ff1

drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c

+5 −4
Original line number Diff line number Diff line
@@ -279,10 +279,6 @@ static int ge_b850v3_lvds_init(struct device *dev) 
		return -ENOMEM;

	}



	ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs;

	ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node;

	drm_bridge_add(&ge_b850v3_lvds_ptr->bridge);



success:

	mutex_unlock(&ge_b850v3_lvds_dev_mutex);

	return 0;
@@ -317,6 +313,11 @@ static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c, 
	ge_b850v3_lvds_ptr->stdp4028_i2c = stdp4028_i2c;

	i2c_set_clientdata(stdp4028_i2c, ge_b850v3_lvds_ptr);



	/* drm bridge initialization */

	ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs;

	ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node;

	drm_bridge_add(&ge_b850v3_lvds_ptr->bridge);



	/* Clear pending interrupts since power up. */

	i2c_smbus_write_word_data(stdp4028_i2c,

				  STDP4028_DPTX_IRQ_STS_REG,