Merge branch 'for-2.6.37' into HEAD

[pandora-kernel.git] / arch / arm / plat-omap / include / plat / mcbsp.h

diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 4da6f94..b87d83c 100644 (file)
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -30,6 +30,13 @@
 #include <mach/hardware.h>
 #include <plat/clock.h>
 
+/* macro for building platform_device for McBSP ports */
+#define OMAP_MCBSP_PLATFORM_DEVICE(port_nr)            \
+static struct platform_device omap_mcbsp##port_nr = {  \
+       .name   = "omap-mcbsp-dai",                     \
+       .id     = OMAP_MCBSP##port_nr,                  \
+}
+
 #define OMAP7XX_MCBSP1_BASE    0xfffb1000
 #define OMAP7XX_MCBSP2_BASE    0xfffb1800
 
@@ -321,8 +328,8 @@
 #define FSR_SRC_FSX            1
 
 /* McBSP functional clock sources */
-#define MCBSP_CLKS_PAD_SRC     0
-#define MCBSP_CLKS_PRCM_SRC    1
+#define MCBSP_CLKS_PRCM_SRC    0
+#define MCBSP_CLKS_PAD_SRC     1
 
 /* we don't do multichannel for now */
 struct omap_mcbsp_reg_cfg {