From 6b063b2e6f2b5a258f2b3bcc92f81810af77a825 Mon Sep 17 00:00:00 2001 From: Alan Tull Date: Fri, 17 Feb 2012 13:34:53 -0600 Subject: ENGR00173964 make hdmi audio init dependent on hdmi video init Don't show hdmi as an audio playback device if hdmi isn't configured on the command line. Signed-off-by: Alan Tull --- drivers/mfd/mxc-hdmi-core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'drivers/mfd') diff --git a/drivers/mfd/mxc-hdmi-core.c b/drivers/mfd/mxc-hdmi-core.c index 1aa92a01c40c..18fd1a67ba83 100644 --- a/drivers/mfd/mxc-hdmi-core.c +++ b/drivers/mfd/mxc-hdmi-core.c @@ -63,6 +63,7 @@ static int hdmi_ratio; int mxc_hdmi_ipu_id; int mxc_hdmi_disp_id; static struct mxc_edid_cfg hdmi_core_edid_cfg; +static int hdmi_core_init; u8 hdmi_readb(unsigned int reg) { @@ -487,6 +488,16 @@ void hdmi_get_edid_cfg(struct mxc_edid_cfg *cfg) spin_unlock_irqrestore(&edid_spinlock, flags); } +void hdmi_set_registered(int registered) +{ + hdmi_core_init = registered; +} + +int hdmi_get_registered(void) +{ + return hdmi_core_init; +} + static int mxc_hdmi_core_probe(struct platform_device *pdev) { struct fsl_mxc_hdmi_core_platform_data *pdata = pdev->dev.platform_data; @@ -498,6 +509,9 @@ static int mxc_hdmi_core_probe(struct platform_device *pdev) overflow_lo = false; overflow_hi = false; #endif + + hdmi_core_init = 0; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) return -ENOENT; -- cgit v1.2.3