022658beab
Currently ASoC can only add kcontrols using codec and platform component device handles. It's also desirable to add kcontrols for DAIs (i.e. McBSP) and for SoC card machine drivers too. This allows the kcontrol to have a direct handle to the parent ASoC component DAI/SoC Card/Platform/Codec device and hence easily get it's private data. This change makes snd_soc_add_controls() static and wraps it in the folowing calls (card and dai are new) :- snd_soc_add_card_controls() snd_soc_add_codec_controls() snd_soc_add_dai_controls() snd_soc_add_platform_controls() This patch also does a lot of small mechanical changes in individual codec drivers to replace snd_soc_add_controls() with snd_soc_add_codec_controls(). It also updates the McBSP DAI driver to use snd_soc_add_dai_controls(). Finally, it updates the existing machine drivers that register controls to either :- 1) Use snd_soc_add_card_controls() where no direct codec control is required. 2) Use snd_soc_add_codec_controls() where there is direct codec control. In the case of 1) above we also update the machine drivers to get the correct component data pointers from the kcontrol (rather than getting the machine pointer via the codec pointer). Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
64 lines
1.9 KiB
C
64 lines
1.9 KiB
C
/*
|
|
* omap-mcbsp.h
|
|
*
|
|
* Copyright (C) 2008 Nokia Corporation
|
|
*
|
|
* Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
|
|
* Peter Ujfalusi <peter.ujfalusi@ti.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*
|
|
*/
|
|
|
|
#ifndef __OMAP_I2S_H__
|
|
#define __OMAP_I2S_H__
|
|
|
|
/* Source clocks for McBSP sample rate generator */
|
|
enum omap_mcbsp_clksrg_clk {
|
|
OMAP_MCBSP_SYSCLK_CLKS_FCLK, /* Internal FCLK */
|
|
OMAP_MCBSP_SYSCLK_CLKS_EXT, /* External CLKS pin */
|
|
OMAP_MCBSP_SYSCLK_CLK, /* Internal ICLK */
|
|
OMAP_MCBSP_SYSCLK_CLKX_EXT, /* External CLKX pin */
|
|
OMAP_MCBSP_SYSCLK_CLKR_EXT, /* External CLKR pin */
|
|
OMAP_MCBSP_CLKR_SRC_CLKR, /* CLKR from CLKR pin */
|
|
OMAP_MCBSP_CLKR_SRC_CLKX, /* CLKR from CLKX pin */
|
|
OMAP_MCBSP_FSR_SRC_FSR, /* FSR from FSR pin */
|
|
OMAP_MCBSP_FSR_SRC_FSX, /* FSR from FSX pin */
|
|
};
|
|
|
|
/* McBSP dividers */
|
|
enum omap_mcbsp_div {
|
|
OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */
|
|
};
|
|
|
|
#if defined(CONFIG_SOC_OMAP2420)
|
|
#define NUM_LINKS 2
|
|
#endif
|
|
#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
|
|
#undef NUM_LINKS
|
|
#define NUM_LINKS 3
|
|
#endif
|
|
#if defined(CONFIG_ARCH_OMAP4)
|
|
#undef NUM_LINKS
|
|
#define NUM_LINKS 4
|
|
#endif
|
|
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
|
|
#undef NUM_LINKS
|
|
#define NUM_LINKS 5
|
|
#endif
|
|
|
|
int omap_mcbsp_st_add_controls(struct snd_soc_dai *dai);
|
|
|
|
#endif
|