ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 8 Mar 2012 08:40:08 +0000 (10:40 +0200)
committerLiam Girdwood <lrg@ti.com>
Mon, 12 Mar 2012 13:34:23 +0000 (13:34 +0000)
Clock signal muxing, and functional clock related defines are only needed
in ASoC drivers.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Mark Brown <broonoie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
arch/arm/plat-omap/include/plat/mcbsp.h
sound/soc/omap/mcbsp.h

index 8eb9b0e7a85254e7062d434234a67b9824fe918b..18814127809aa031d3d5abc1ff64c5000ba1cd49 100644 (file)
 #define MCBSP_CONFIG_TYPE3     0x3
 #define MCBSP_CONFIG_TYPE4     0x4
 
-/* CLKR signal muxing options */
-#define CLKR_SRC_CLKR          0
-#define CLKR_SRC_CLKX          1
-
-/* FSR signal muxing options */
-#define FSR_SRC_FSR            0
-#define FSR_SRC_FSX            1
-
-/* McBSP functional clock sources */
-#define MCBSP_CLKS_PRCM_SRC    0
-#define MCBSP_CLKS_PAD_SRC     1
-
 /* Platform specific configuration */
 struct omap_mcbsp_ops {
        void (*request)(unsigned int);
index a5518d71913feba3fef889768ad039f2f8312ceb..acc94700f5b78eaea6bd9bdbaca92e49107255bd 100644 (file)
@@ -230,6 +230,18 @@ enum {
 #define XRDYEN                 BIT(10)
 #define XEMPTYEOFEN            BIT(14)
 
+/* CLKR signal muxing options */
+#define CLKR_SRC_CLKR          0
+#define CLKR_SRC_CLKX          1
+
+/* FSR signal muxing options */
+#define FSR_SRC_FSR            0
+#define FSR_SRC_FSX            1
+
+/* McBSP functional clock sources */
+#define MCBSP_CLKS_PRCM_SRC    0
+#define MCBSP_CLKS_PAD_SRC     1
+
 /* we don't do multichannel for now */
 struct omap_mcbsp_reg_cfg {
        u16 spcr2;