提交 e93c7d1b 编写于 作者: P Peter Ujfalusi 提交者: Mark Brown

ASoC: omap-mcbsp: Fix compilation error due to leftover code

Part of commit (which patches sound/soc/omap/mcbsp.c file):
8fef6263 ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code

since the tree where it has been applied did not had the earlier patch:
d0db84e7 ASoC: omap-mcbsp: Fix 6pin mux configuration
which changed code around omap_mcbsp_6pin_src_mux().

Because of the missing part from 8fef6263 the sound/soc/omap/mcbsp.c does
not compile in linux-next.
Signed-off-by: NPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 fc600432
...@@ -762,37 +762,6 @@ int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) ...@@ -762,37 +762,6 @@ int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
} }
int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
{
const char *signal, *src;
if (!mcbsp->pdata->mux_signal)
return -EINVAL;
switch (mux) {
case CLKR_SRC_CLKR:
signal = "clkr";
src = "clkr";
break;
case CLKR_SRC_CLKX:
signal = "clkr";
src = "clkx";
break;
case FSR_SRC_FSR:
signal = "fsr";
src = "fsr";
break;
case FSR_SRC_FSX:
signal = "fsr";
src = "fsx";
break;
default:
return -EINVAL;
}
return mcbsp->pdata->mux_signal(mcbsp->dev, signal, src);
}
#define max_thres(m) (mcbsp->pdata->buffer_size) #define max_thres(m) (mcbsp->pdata->buffer_size)
#define valid_threshold(m, val) ((val) <= max_thres(m)) #define valid_threshold(m, val) ((val) <= max_thres(m))
#define THRESHOLD_PROP_BUILDER(prop) \ #define THRESHOLD_PROP_BUILDER(prop) \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册