OMAPDSS: HDMI clean up hpd_gpio
hpd_gpio is no longer used by the OMAP4 HDMI IP driver, and we can thus remove the unnecessary code. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
ddb1d5ca99
commit
29356be1e0
|
@ -797,7 +797,6 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = {
|
||||||
.phy_enable = ti_hdmi_4xxx_phy_enable,
|
.phy_enable = ti_hdmi_4xxx_phy_enable,
|
||||||
.phy_disable = ti_hdmi_4xxx_phy_disable,
|
.phy_disable = ti_hdmi_4xxx_phy_disable,
|
||||||
.read_edid = ti_hdmi_4xxx_read_edid,
|
.read_edid = ti_hdmi_4xxx_read_edid,
|
||||||
.detect = ti_hdmi_4xxx_detect,
|
|
||||||
.pll_enable = ti_hdmi_4xxx_pll_enable,
|
.pll_enable = ti_hdmi_4xxx_pll_enable,
|
||||||
.pll_disable = ti_hdmi_4xxx_pll_disable,
|
.pll_disable = ti_hdmi_4xxx_pll_disable,
|
||||||
.video_enable = ti_hdmi_4xxx_wp_video_start,
|
.video_enable = ti_hdmi_4xxx_wp_video_start,
|
||||||
|
|
|
@ -710,7 +710,7 @@ bool omapdss_hdmi_detect(void)
|
||||||
r = hdmi_runtime_get();
|
r = hdmi_runtime_get();
|
||||||
BUG_ON(r);
|
BUG_ON(r);
|
||||||
|
|
||||||
r = hdmi.ip_data.ops->detect(&hdmi.ip_data);
|
r = gpio_get_value(hdmi.hpd_gpio);
|
||||||
|
|
||||||
hdmi_runtime_put();
|
hdmi_runtime_put();
|
||||||
mutex_unlock(&hdmi.lock);
|
mutex_unlock(&hdmi.lock);
|
||||||
|
@ -733,8 +733,6 @@ int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
|
||||||
goto err0;
|
goto err0;
|
||||||
}
|
}
|
||||||
|
|
||||||
hdmi.ip_data.hpd_gpio = hdmi.hpd_gpio;
|
|
||||||
|
|
||||||
r = hdmi_power_on_full(dssdev);
|
r = hdmi_power_on_full(dssdev);
|
||||||
if (r) {
|
if (r) {
|
||||||
DSSERR("failed to power on device\n");
|
DSSERR("failed to power on device\n");
|
||||||
|
@ -768,8 +766,6 @@ int omapdss_hdmi_core_enable(struct omap_dss_device *dssdev)
|
||||||
|
|
||||||
mutex_lock(&hdmi.lock);
|
mutex_lock(&hdmi.lock);
|
||||||
|
|
||||||
hdmi.ip_data.hpd_gpio = hdmi.hpd_gpio;
|
|
||||||
|
|
||||||
r = hdmi_power_on_core(dssdev);
|
r = hdmi_power_on_core(dssdev);
|
||||||
if (r) {
|
if (r) {
|
||||||
DSSERR("failed to power on device\n");
|
DSSERR("failed to power on device\n");
|
||||||
|
|
|
@ -73,8 +73,6 @@ struct ti_hdmi_ip_ops {
|
||||||
|
|
||||||
int (*read_edid)(struct hdmi_ip_data *ip_data, u8 *edid, int len);
|
int (*read_edid)(struct hdmi_ip_data *ip_data, u8 *edid, int len);
|
||||||
|
|
||||||
bool (*detect)(struct hdmi_ip_data *ip_data);
|
|
||||||
|
|
||||||
int (*pll_enable)(struct hdmi_ip_data *ip_data);
|
int (*pll_enable)(struct hdmi_ip_data *ip_data);
|
||||||
|
|
||||||
void (*pll_disable)(struct hdmi_ip_data *ip_data);
|
void (*pll_disable)(struct hdmi_ip_data *ip_data);
|
||||||
|
@ -162,13 +160,11 @@ struct hdmi_ip_data {
|
||||||
struct hdmi_core_infoframe_avi avi_cfg;
|
struct hdmi_core_infoframe_avi avi_cfg;
|
||||||
|
|
||||||
/* ti_hdmi_4xxx_ip private data. These should be in a separate struct */
|
/* ti_hdmi_4xxx_ip private data. These should be in a separate struct */
|
||||||
int hpd_gpio;
|
|
||||||
struct mutex lock;
|
struct mutex lock;
|
||||||
};
|
};
|
||||||
int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
|
int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
|
||||||
void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
|
void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
|
||||||
int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, u8 *edid, int len);
|
int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, u8 *edid, int len);
|
||||||
bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data);
|
|
||||||
int ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data);
|
int ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data);
|
||||||
void ti_hdmi_4xxx_wp_video_stop(struct hdmi_ip_data *ip_data);
|
void ti_hdmi_4xxx_wp_video_stop(struct hdmi_ip_data *ip_data);
|
||||||
int ti_hdmi_4xxx_pll_enable(struct hdmi_ip_data *ip_data);
|
int ti_hdmi_4xxx_pll_enable(struct hdmi_ip_data *ip_data);
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
|
#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
|
||||||
#include <sound/asound.h>
|
#include <sound/asound.h>
|
||||||
#include <sound/asoundef.h>
|
#include <sound/asoundef.h>
|
||||||
|
@ -481,11 +480,6 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data,
|
||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data)
|
|
||||||
{
|
|
||||||
return gpio_get_value(ip_data->hpd_gpio);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,
|
static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,
|
||||||
struct hdmi_core_infoframe_avi *avi_cfg,
|
struct hdmi_core_infoframe_avi *avi_cfg,
|
||||||
struct hdmi_core_packet_enable_repeat *repeat_cfg)
|
struct hdmi_core_packet_enable_repeat *repeat_cfg)
|
||||||
|
|
Loading…
Reference in a new issue