Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / include / sound / asound.h

diff --git a/include/sound/asound.h b/include/sound/asound.h
index a2e4ff5ba9e9f12be58de88d38fdf0645289ca4b..0876a1e76aefbd97dc66eb76d480e7e05573f68d 100644 (file)
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -68,6 +68,20 @@ struct snd_aes_iec958 {
        unsigned char dig_subframe[4];  /* AES/IEC958 subframe bits */
 };
 
+/****************************************************************************
+ *                                                                          *
+ *        CEA-861 Audio InfoFrame. Used in HDMI and DisplayPort                    *
+ *                                                                          *
+ ****************************************************************************/
+
+struct snd_cea_861_aud_if {
+       unsigned char db1_ct_cc; /* coding type and channel count */
+       unsigned char db2_sf_ss; /* sample frequency and size */
+       unsigned char db3; /* not used, all zeros */
+       unsigned char db4_ca; /* channel allocation code */
+       unsigned char db5_dminh_lsv; /* downmix inhibit & level-shit values */
+};
+
 /****************************************************************************
  *                                                                          *
  *      Section for driver hardware dependent interface - /dev/snd/hw?      *