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

Commit ece2f153 authored by Jassi Brar's avatar Jassi Brar Committed by Tomi Valkeinen
Browse files

OMAPDSS: HDMI: Discard phy_tx_enabled member 



It is simpler to read the current status from a register as compared
to maintaining a state variable to hold the information.

Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 6f1891fc

drivers/video/omap2/dss/ti_hdmi.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ struct hdmi_ip_data { 


	/* ti_hdmi_4xxx_ip private data. These should be in a separate struct */

	int hpd_gpio;

	bool phy_tx_enabled;

};

int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);

void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);

drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c

+4 −7
Original line number Diff line number Diff line
@@ -157,6 +157,10 @@ static int hdmi_pll_init(struct hdmi_ip_data *ip_data) 
/* PHY_PWR_CMD */

static int hdmi_set_phy_pwr(struct hdmi_ip_data *ip_data, enum hdmi_phy_pwr val)

{

	/* Return if already the state */

	if (REG_GET(hdmi_wp_base(ip_data), HDMI_WP_PWR_CTRL, 5, 4) == val)

		return 0;



	/* Command for power control of HDMI PHY */

	REG_FLD_MOD(hdmi_wp_base(ip_data), HDMI_WP_PWR_CTRL, val, 7, 6);
@@ -241,11 +245,6 @@ static int hdmi_check_hpd_state(struct hdmi_ip_data *ip_data) 


	hpd = gpio_get_value(ip_data->hpd_gpio);



	if (hpd == ip_data->phy_tx_enabled) {

		spin_unlock_irqrestore(&phy_tx_lock, flags);

		return 0;

	}



	if (hpd)

		r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_TXON);

	else
@@ -257,7 +256,6 @@ static int hdmi_check_hpd_state(struct hdmi_ip_data *ip_data) 
		goto err;

	}



	ip_data->phy_tx_enabled = hpd;

err:

	spin_unlock_irqrestore(&phy_tx_lock, flags);

	return r;
@@ -327,7 +325,6 @@ void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data) 
	free_irq(gpio_to_irq(ip_data->hpd_gpio), ip_data);



	hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);

	ip_data->phy_tx_enabled = false;

}



static int hdmi_core_ddc_init(struct hdmi_ip_data *ip_data)