Hi Jarkko,
On 03/08/2012 11:22 AM, Peter Ujfalusi wrote:
> Clock signal muxing, and functional clock related defines are only needed
> in ASoC drivers.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx>
> Acked-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxxx>
I have added your ack to this patch by accident when I updated the
series. Sorry about that.
Please confirm if you are OK with this change.
Sorry again,
Péter
> ---
> arch/arm/plat-omap/include/plat/mcbsp.h | 12 ------------
> sound/soc/omap/mcbsp.h | 12 ++++++++++++
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
> index 8eb9b0e..1881412 100644
> --- a/arch/arm/plat-omap/include/plat/mcbsp.h
> +++ b/arch/arm/plat-omap/include/plat/mcbsp.h
> @@ -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);
> diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
> index a5518d7..acc9470 100644
> --- a/sound/soc/omap/mcbsp.h
> +++ b/sound/soc/omap/mcbsp.h
> @@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
