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

Commit 5e74c22c authored by Russell King's avatar Russell King Committed by Dave Airlie
Browse files

drm/i2c: tda998x: prepare for video input configuration 



The video-input-port (VIP) is highly configurable. This prepares
current driver to allow to configure VIP configuration, as some
boards connect lcd controller and TDA998x "pin-swapped" and depend
on VIP to swap the pins by register configuration.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarDarren Etheridge <detheridge@ti.com>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarRussell King <rmk_kernel@arm.linux.org.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 20c17675

drivers/gpu/drm/i2c/tda998x_drv.c

+10 −6
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ struct tda998x_priv { 
	uint16_t rev;

	uint8_t current_page;

	int dpms;

	u8 vip_cntrl_0;

	u8 vip_cntrl_1;

	u8 vip_cntrl_2;

};



#define to_tda998x_priv(x)  ((struct tda998x_priv *)to_encoder_slave(x)->slave_priv)
@@ -448,12 +451,9 @@ tda998x_encoder_dpms(struct drm_encoder *encoder, int mode) 
		reg_write(encoder, REG_ENA_VP_1, 0xff);

		reg_write(encoder, REG_ENA_VP_2, 0xff);

		/* set muxing after enabling ports: */

		reg_write(encoder, REG_VIP_CNTRL_0,

				VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3));

		reg_write(encoder, REG_VIP_CNTRL_1,

				VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1));

		reg_write(encoder, REG_VIP_CNTRL_2,

				VIP_CNTRL_2_SWAP_E(4) | VIP_CNTRL_2_SWAP_F(5));

		reg_write(encoder, REG_VIP_CNTRL_0, priv->vip_cntrl_0);

		reg_write(encoder, REG_VIP_CNTRL_1, priv->vip_cntrl_1);

		reg_write(encoder, REG_VIP_CNTRL_2, priv->vip_cntrl_2);

		break;

	case DRM_MODE_DPMS_OFF:

		/* disable audio and video ports */
@@ -823,6 +823,10 @@ tda998x_encoder_init(struct i2c_client *client, 
	if (!priv)

		return -ENOMEM;



	priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3);

	priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1);

	priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(4) | VIP_CNTRL_2_SWAP_F(5);



	priv->current_page = 0;

	priv->cec = i2c_new_dummy(client->adapter, 0x34);

	priv->dpms = DRM_MODE_DPMS_OFF;