Merge remote-tracking branch 'omap_dss2/for-next'

[karo-tx-linux.git] / drivers / video / fbdev / omap2 / dss / hdmi.h

diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h
index e4a32fe77b0256fa0850e8ba59f5e5e2d9e96eef..53616b02b61371b1eb0d6c0c6819cb931cac39a9 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi.h
+++ b/drivers/video/fbdev/omap2/dss/hdmi.h
@@ -351,13 +351,20 @@ struct omap_hdmi {
        struct regulator *vdda_reg;
 
        bool core_enabled;
-       bool display_enabled;
 
        struct omap_dss_device output;
 
        struct platform_device *audio_pdev;
        void (*audio_abort_cb)(struct device *dev);
        int wp_idlemode;
+
+       bool audio_configured;
+       struct omap_dss_audio audio_config;
+
+       /* This lock should be taken when booleans bellow are touched. */
+       spinlock_t audio_playing_lock;
+       bool audio_playing;
+       bool display_enabled;
 };
 
 #endif