target/linux/omap/patches-3.12/400-ASoC-davinci-evm-Move-sysclk-logic-away-from-evm_hw_.patch

   1 From 13254d51149ce1a0fdbb38fa229c6cc91bcbe6ec Mon Sep 17 00:00:00 2001
   2 From: Jyri Sarha <jsarha@ti.com>
   3 Date: Fri, 13 Sep 2013 17:43:18 +0300
   4 Subject: [PATCH 211/752] ASoC: davinci-evm: Move sysclk logic away from
   5  evm_hw_params
   6
   7 The sysclk rate does not change runtime so it should be initialized at
   8 init time.
   9
  10 Signed-off-by: Jyri Sarha <jsarha@ti.com>
  11 ---
  12  sound/soc/davinci/davinci-evm.c |   64 +++++++++++++++++++++++++++------------
  13  1 file changed, 44 insertions(+), 20 deletions(-)
  14
  15 --- a/sound/soc/davinci/davinci-evm.c
  16 +++ b/sound/soc/davinci/davinci-evm.c
  17 @@ -27,6 +27,10 @@
  18  #include "davinci-i2s.h"
  19  #include "davinci-mcasp.h"
  20
  21 +struct snd_soc_card_drvdata_davinci {
  22 +       unsigned sysclk;
  23 +};
  24 +
  25  #define AUDIO_FORMAT (SND_SOC_DAIFMT_DSP_B | \
  26                 SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF)
  27  static int evm_hw_params(struct snd_pcm_substream *substream,
  28 @@ -35,27 +39,11 @@ static int evm_hw_params(struct snd_pcm_
  29         struct snd_soc_pcm_runtime *rtd = substream->private_data;
  30         struct snd_soc_dai *codec_dai = rtd->codec_dai;
  31         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
  32 +       struct snd_soc_codec *codec = rtd->codec;
  33 +       struct snd_soc_card *soc_card = codec->card;
  34         int ret = 0;
  35 -       unsigned sysclk;
  36 -
  37 -       /* ASP1 on DM355 EVM is clocked by an external oscillator */
  38 -       if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm() ||
  39 -           machine_is_davinci_dm365_evm())
  40 -               sysclk = 27000000;
  41 -
  42 -       /* ASP0 in DM6446 EVM is clocked by U55, as configured by
  43 -        * board-dm644x-evm.c using GPIOs from U18.  There are six
  44 -        * options; here we "know" we use a 48 KHz sample rate.
  45 -        */
  46 -       else if (machine_is_davinci_evm())
  47 -               sysclk = 12288000;
  48 -
  49 -       else if (machine_is_davinci_da830_evm() ||
  50 -                               machine_is_davinci_da850_evm())
  51 -               sysclk = 24576000;
  52 -
  53 -       else
  54 -               return -EINVAL;
  55 +       unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
  56 +                          snd_soc_card_get_drvdata(soc_card))->sysclk;
  57
  58         /* set codec DAI configuration */
  59         ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);
  60 @@ -243,35 +231,65 @@ static struct snd_soc_dai_link da850_evm
  61  };
  62
  63  /* davinci dm6446 evm audio machine driver */
  64 +/*
  65 + * ASP0 in DM6446 EVM is clocked by U55, as configured by
  66 + * board-dm644x-evm.c using GPIOs from U18.  There are six
  67 + * options; here we "know" we use a 48 KHz sample rate.
  68 + */
  69 +static struct snd_soc_card_drvdata_davinci dm6446_snd_soc_card_drvdata = {
  70 +       .sysclk = 12288000,
  71 +};
  72 +
  73  static struct snd_soc_card dm6446_snd_soc_card_evm = {
  74         .name = "DaVinci DM6446 EVM",
  75         .owner = THIS_MODULE,
  76         .dai_link = &dm6446_evm_dai,
  77         .num_links = 1,
  78 +       .drvdata = &dm6446_snd_soc_card_drvdata,
  79  };
  80
  81  /* davinci dm355 evm audio machine driver */
  82 +/* ASP1 on DM355 EVM is clocked by an external oscillator */
  83 +static struct snd_soc_card_drvdata_davinci dm355_snd_soc_card_drvdata = {
  84 +       .sysclk = 27000000,
  85 +};
  86 +
  87  static struct snd_soc_card dm355_snd_soc_card_evm = {
  88         .name = "DaVinci DM355 EVM",
  89         .owner = THIS_MODULE,
  90         .dai_link = &dm355_evm_dai,
  91         .num_links = 1,
  92 +       .drvdata = &dm355_snd_soc_card_drvdata,
  93  };
  94
  95  /* davinci dm365 evm audio machine driver */
  96 +static struct snd_soc_card_drvdata_davinci dm365_snd_soc_card_drvdata = {
  97 +       .sysclk = 27000000,
  98 +};
  99 +
 100  static struct snd_soc_card dm365_snd_soc_card_evm = {
 101         .name = "DaVinci DM365 EVM",
 102         .owner = THIS_MODULE,
 103         .dai_link = &dm365_evm_dai,
 104         .num_links = 1,
 105 +       .drvdata = &dm365_snd_soc_card_drvdata,
 106  };
 107
 108  /* davinci dm6467 evm audio machine driver */
 109 +static struct snd_soc_card_drvdata_davinci dm6467_snd_soc_card_drvdata = {
 110 +       .sysclk = 27000000,
 111 +};
 112 +
 113  static struct snd_soc_card dm6467_snd_soc_card_evm = {
 114         .name = "DaVinci DM6467 EVM",
 115         .owner = THIS_MODULE,
 116         .dai_link = dm6467_evm_dai,
 117         .num_links = ARRAY_SIZE(dm6467_evm_dai),
 118 +       .drvdata = &dm6467_snd_soc_card_drvdata,
 119 +};
 120 +
 121 +static struct snd_soc_card_drvdata_davinci da830_snd_soc_card_drvdata = {
 122 +       .sysclk = 24576000,
 123  };
 124
 125  static struct snd_soc_card da830_snd_soc_card = {
 126 @@ -279,6 +297,11 @@ static struct snd_soc_card da830_snd_soc
 127         .owner = THIS_MODULE,
 128         .dai_link = &da830_evm_dai,
 129         .num_links = 1,
 130 +       .drvdata = &da830_snd_soc_card_drvdata,
 131 +};
 132 +
 133 +static struct snd_soc_card_drvdata_davinci da850_snd_soc_card_drvdata = {
 134 +       .sysclk = 24576000,
 135  };
 136
 137  static struct snd_soc_card da850_snd_soc_card = {
 138 @@ -286,6 +309,7 @@ static struct snd_soc_card da850_snd_soc
 139         .owner = THIS_MODULE,
 140         .dai_link = &da850_evm_dai,
 141         .num_links = 1,
 142 +       .drvdata = &da850_snd_soc_card_drvdata,
 143  };
 144
 145  static struct platform_device *evm_snd_device;