Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

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

diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index b457e87fbd0849efd51fd22445cb76606c8f6d70..906010344dd7e0a227449f674d64b00a07dc1e86 100644 (file)
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -21,10 +21,11 @@
 /*
  * flags format
  *
- * 0x000000BA
+ * 0x00000CBA
  *
  * A:  inversion
  * B:  format mode
+ * C:  chip specific
  */
 
 /* A: clock inversion */
@@ -39,6 +40,9 @@
 #define SH_FSI_FMT_DAI         (0 << 4)
 #define SH_FSI_FMT_SPDIF       (1 << 4)
 
+/* C: chip specific */
+#define SH_FSI_OPTION_MASK     0x00000F00
+#define SH_FSI_ENABLE_STREAM_MODE      (1 << 8) /* for 16bit data */
 
 /*
  * set_rate return value
@@ -84,16 +88,4 @@ struct sh_fsi_platform_info {
        struct sh_fsi_port_info port_b;
 };
 
-/*
- * for fsi-ak4642
- */
-struct fsi_ak4642_info {
-       const char *name;
-       const char *card;
-       const char *cpu_dai;
-       const char *codec;
-       const char *platform;
-       int id;
-};
-
 #endif /* __SOUND_FSI_H */