Merge tag 'pwm/for-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[cascardo/linux.git] / include / sound / sh_fsi.h

diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index cc1c919..7a9710b 100644 (file)
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -11,82 +11,20 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
-#define FSI_PORT_A     0
-#define FSI_PORT_B     1
-
 #include <linux/clk.h>
 #include <sound/soc.h>
 
 /*
- * flags format
- *
- * 0x00000CBA
- *
- * A:  inversion
- * B:  format mode
- * C:  chip specific
- * D:  clock selecter if master mode
+ * flags
  */
-
-/* A: clock inversion */
-#define SH_FSI_INVERSION_MASK  0x0000000F
-#define SH_FSI_LRM_INV         (1 << 0)
-#define SH_FSI_BRM_INV         (1 << 1)
-#define SH_FSI_LRS_INV         (1 << 2)
-#define SH_FSI_BRS_INV         (1 << 3)
-
-/* B: format mode */
-#define SH_FSI_FMT_MASK                0x000000F0
-#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 */
-
-/* D:  clock selecter if master mode */
-#define SH_FSI_CLK_MASK                0x0000F000
-#define SH_FSI_CLK_EXTERNAL    (0 << 12)
-#define SH_FSI_CLK_CPG         (1 << 12) /* FSIxCK + FSI-DIV */
-
-/*
- * set_rate return value
- *
- * see ACKMD/BPFMD on
- *     ACK_MD (FSI2)
- *     CKG1   (FSI)
- *
- * err         : return value <  0
- * no change   : return value == 0
- * change xMD  : return value >  0
- *
- * 0x-00000AB
- *
- * A:  ACKMD value
- * B:  BPFMD value
- */
-
-#define SH_FSI_ACKMD_MASK      (0xF << 0)
-#define SH_FSI_ACKMD_512       (1 << 0)
-#define SH_FSI_ACKMD_256       (2 << 0)
-#define SH_FSI_ACKMD_128       (3 << 0)
-#define SH_FSI_ACKMD_64                (4 << 0)
-#define SH_FSI_ACKMD_32                (5 << 0)
-
-#define SH_FSI_BPFMD_MASK      (0xF << 4)
-#define SH_FSI_BPFMD_512       (1 << 4)
-#define SH_FSI_BPFMD_256       (2 << 4)
-#define SH_FSI_BPFMD_128       (3 << 4)
-#define SH_FSI_BPFMD_64                (4 << 4)
-#define SH_FSI_BPFMD_32                (5 << 4)
-#define SH_FSI_BPFMD_16                (6 << 4)
+#define SH_FSI_FMT_SPDIF               (1 << 0) /* spdif for HDMI */
+#define SH_FSI_ENABLE_STREAM_MODE      (1 << 1) /* for 16bit data */
+#define SH_FSI_CLK_CPG                 (1 << 2) /* FSIxCK + FSI-DIV */
 
 struct sh_fsi_port_info {
        unsigned long flags;
        int tx_id;
        int rx_id;
-       int (*set_rate)(struct device *dev, int rate, int enable);
 };
 
 struct sh_fsi_platform_info {