Merge tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h
index 12afab18945d056709df7495b75b0da6c0155426..6add6ccc811e508766e1656164ea9ee09dc50aeb 100644 (file)
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.h
@@ -18,7 +18,7 @@
 #define RSND_GEN1_ADG  1
 #define RSND_GEN1_SSI  2
 
-#define RSND_GEN2_SRU  0
+#define RSND_GEN2_SCU  0
 #define RSND_GEN2_ADG  1
 #define RSND_GEN2_SSIU 2
 #define RSND_GEN2_SSI  3
@@ -34,7 +34,6 @@
  * B : SSI direction
  */
 #define RSND_SSI_CLK_PIN_SHARE         (1 << 31)
-#define RSND_SSI_CLK_FROM_ADG          (1 << 30) /* clock parent is master */
 #define RSND_SSI_SYNC                  (1 << 29) /* SSI34_sync etc */
 
 #define RSND_SSI_PLAY                  (1 << 24)
@@ -58,6 +57,7 @@ struct rsnd_ssi_platform_info {
 
 struct rsnd_scu_platform_info {
        u32 flags;
+       u32 convert_rate; /* sampling rate convert */
 };
 
 /*