Skip to content

Commit

Permalink
ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Ujfalusi authored and Liam Girdwood committed Mar 12, 2012
1 parent 40c0764 commit 33cec39
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 0 additions & 12 deletions arch/arm/plat-omap/include/plat/mcbsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@
#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);
Expand Down
12 changes: 12 additions & 0 deletions sound/soc/omap/mcbsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 33cec39

Please sign in to comment.