aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-08-30 10:06:15 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 08:05:02 -0400
commite93c7d1bc350189511d32cec2f0af79c30e7fa47 (patch)
tree91efa3d6506eb382e05f84bebad8cd04b8ddbbd3 /sound
parentfc600432cd23e35c85de2ff4468d816d6938a112 (diff)
ASoC: omap-mcbsp: Fix compilation error due to leftover code
Part of commit (which patches sound/soc/omap/mcbsp.c file): 8fef626 ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code since the tree where it has been applied did not had the earlier patch: d0db84e ASoC: omap-mcbsp: Fix 6pin mux configuration which changed code around omap_mcbsp_6pin_src_mux(). Because of the missing part from 8fef626 the sound/soc/omap/mcbsp.c does not compile in linux-next. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/mcbsp.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 935ccf633976..bc06175e6367 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -762,37 +762,6 @@ int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
762 762
763} 763}
764 764
765int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
766{
767 const char *signal, *src;
768
769 if (!mcbsp->pdata->mux_signal)
770 return -EINVAL;
771
772 switch (mux) {
773 case CLKR_SRC_CLKR:
774 signal = "clkr";
775 src = "clkr";
776 break;
777 case CLKR_SRC_CLKX:
778 signal = "clkr";
779 src = "clkx";
780 break;
781 case FSR_SRC_FSR:
782 signal = "fsr";
783 src = "fsr";
784 break;
785 case FSR_SRC_FSX:
786 signal = "fsr";
787 src = "fsx";
788 break;
789 default:
790 return -EINVAL;
791 }
792
793 return mcbsp->pdata->mux_signal(mcbsp->dev, signal, src);
794}
795
796#define max_thres(m) (mcbsp->pdata->buffer_size) 765#define max_thres(m) (mcbsp->pdata->buffer_size)
797#define valid_threshold(m, val) ((val) <= max_thres(m)) 766#define valid_threshold(m, val) ((val) <= max_thres(m))
798#define THRESHOLD_PROP_BUILDER(prop) \ 767#define THRESHOLD_PROP_BUILDER(prop) \