Loading drivers/firmware/sigma.c +58 −23 Original line number Diff line number Diff line Loading @@ -14,13 +14,34 @@ #include <linux/module.h> #include <linux/sigma.h> /* Return: 0==OK, <0==error, =1 ==no more actions */ static size_t sigma_action_size(struct sigma_action *sa) { size_t payload = 0; switch (sa->instr) { case SIGMA_ACTION_WRITEXBYTES: case SIGMA_ACTION_WRITESINGLE: case SIGMA_ACTION_WRITESAFELOAD: payload = sigma_action_len(sa); break; default: break; } payload = ALIGN(payload, 2); return payload + sizeof(struct sigma_action); } /* * Returns a negative error value in case of an error, 0 if processing of * the firmware should be stopped after this action, 1 otherwise. */ static int process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw) process_sigma_action(struct i2c_client *client, struct sigma_action *sa) { struct sigma_action *sa = (void *)(ssfw->fw->data + ssfw->pos); size_t len = sigma_action_len(sa); int ret = 0; int ret; pr_debug("%s: instr:%i addr:%#x len:%zu\n", __func__, sa->instr, sa->addr, len); Loading @@ -29,44 +50,50 @@ process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw) case SIGMA_ACTION_WRITEXBYTES: case SIGMA_ACTION_WRITESINGLE: case SIGMA_ACTION_WRITESAFELOAD: if (ssfw->fw->size < ssfw->pos + len) return -EINVAL; ret = i2c_master_send(client, (void *)&sa->addr, len); if (ret < 0) return -EINVAL; break; case SIGMA_ACTION_DELAY: ret = 0; udelay(len); len = 0; break; case SIGMA_ACTION_END: return 1; return 0; default: return -EINVAL; } /* when arrive here ret=0 or sent data */ ssfw->pos += sigma_action_size(sa, len); return ssfw->pos == ssfw->fw->size; return 1; } static int process_sigma_actions(struct i2c_client *client, struct sigma_firmware *ssfw) { pr_debug("%s: processing %p\n", __func__, ssfw); struct sigma_action *sa; size_t size; int ret; while (ssfw->pos + sizeof(*sa) <= ssfw->fw->size) { sa = (struct sigma_action *)(ssfw->fw->data + ssfw->pos); size = sigma_action_size(sa); ssfw->pos += size; if (ssfw->pos > ssfw->fw->size || size == 0) break; ret = process_sigma_action(client, sa); while (1) { int ret = process_sigma_action(client, ssfw); pr_debug("%s: action returned %i\n", __func__, ret); if (ret == 1) return 0; else if (ret) if (ret <= 0) return ret; } if (ssfw->pos != ssfw->fw->size) return -EINVAL; return 0; } int process_sigma_firmware(struct i2c_client *client, const char *name) Loading @@ -89,16 +116,24 @@ int process_sigma_firmware(struct i2c_client *client, const char *name) /* then verify the header */ ret = -EINVAL; if (fw->size < sizeof(*ssfw_head)) /* * Reject too small or unreasonable large files. The upper limit has been * chosen a bit arbitrarily, but it should be enough for all practical * purposes and having the limit makes it easier to avoid integer * overflows later in the loading process. */ if (fw->size < sizeof(*ssfw_head) || fw->size >= 0x4000000) goto done; ssfw_head = (void *)fw->data; if (memcmp(ssfw_head->magic, SIGMA_MAGIC, ARRAY_SIZE(ssfw_head->magic))) goto done; crc = crc32(0, fw->data, fw->size); crc = crc32(0, fw->data + sizeof(*ssfw_head), fw->size - sizeof(*ssfw_head)); pr_debug("%s: crc=%x\n", __func__, crc); if (crc != ssfw_head->crc) if (crc != le32_to_cpu(ssfw_head->crc)) goto done; ssfw.pos = sizeof(*ssfw_head); Loading include/linux/sigma.h +4 −9 Original line number Diff line number Diff line Loading @@ -24,7 +24,7 @@ struct sigma_firmware { struct sigma_firmware_header { unsigned char magic[7]; u8 version; u32 crc; __le32 crc; }; enum { Loading @@ -40,19 +40,14 @@ enum { struct sigma_action { u8 instr; u8 len_hi; u16 len; u16 addr; __le16 len; __be16 addr; unsigned char payload[]; }; static inline u32 sigma_action_len(struct sigma_action *sa) { return (sa->len_hi << 16) | sa->len; } static inline size_t sigma_action_size(struct sigma_action *sa, u32 payload_len) { return sizeof(*sa) + payload_len + (payload_len % 2); return (sa->len_hi << 16) | le16_to_cpu(sa->len); } extern int process_sigma_firmware(struct i2c_client *client, const char *name); Loading sound/soc/atmel/Kconfig +1 −20 Original line number Diff line number Diff line config SND_ATMEL_SOC tristate "SoC Audio for the Atmel System-on-Chip" depends on ARCH_AT91 || AVR32 depends on ARCH_AT91 help Say Y or M if you want to add support for codecs attached to the ATMEL SSC interface. You will also need Loading @@ -24,25 +24,6 @@ config SND_AT91_SOC_SAM9G20_WM8731 Say Y if you want to add support for SoC audio on WM8731-based AT91sam9g20 evaluation board. config SND_AT32_SOC_PLAYPAQ tristate "SoC Audio support for PlayPaq with WM8510" depends on SND_ATMEL_SOC && BOARD_PLAYPAQ && AT91_PROGRAMMABLE_CLOCKS select SND_ATMEL_SOC_SSC select SND_SOC_WM8510 help Say Y or M here if you want to add support for SoC audio on the LRS PlayPaq. config SND_AT32_SOC_PLAYPAQ_SLAVE bool "Run CODEC on PlayPaq in slave mode" depends on SND_AT32_SOC_PLAYPAQ default n help Say Y if you want to run with the AT32 SSC generating the BCLK and FRAME signals on the PlayPaq. Unless you want to play with the AT32 as the SSC master, you probably want to say N here, as this will give you better sound quality. config SND_AT91_SOC_AFEB9260 tristate "SoC Audio support for AFEB9260 board" depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC Loading sound/soc/atmel/Makefile +0 −4 Original line number Diff line number Diff line Loading @@ -8,9 +8,5 @@ obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o # AT91 Machine Support snd-soc-sam9g20-wm8731-objs := sam9g20_wm8731.o # AT32 Machine Support snd-soc-playpaq-objs := playpaq_wm8510.o obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o obj-$(CONFIG_SND_AT91_SOC_AFEB9260) += snd-soc-afeb9260.o sound/soc/atmel/playpaq_wm8510.cdeleted 100644 → 0 +0 −473 Original line number Diff line number Diff line /* sound/soc/at32/playpaq_wm8510.c * ASoC machine driver for PlayPaq using WM8510 codec * * Copyright (C) 2008 Long Range Systems * Geoffrey Wossum <gwossum@acm.org> * * 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 code is largely inspired by sound/soc/at91/eti_b1_wm8731.c * * NOTE: If you don't have the AT32 enhanced portmux configured (which * isn't currently in the mainline or Atmel patched kernel), you will * need to set the MCLK pin (PA30) to peripheral A in your board initialization * code. Something like: * at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0); * */ /* #define DEBUG */ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/clk.h> #include <linux/timer.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> #include <mach/at32ap700x.h> #include <mach/portmux.h> #include "../codecs/wm8510.h" #include "atmel-pcm.h" #include "atmel_ssc_dai.h" /*-------------------------------------------------------------------------*\ * constants \*-------------------------------------------------------------------------*/ #define MCLK_PIN GPIO_PIN_PA(30) #define MCLK_PERIPH GPIO_PERIPH_A /*-------------------------------------------------------------------------*\ * data types \*-------------------------------------------------------------------------*/ /* SSC clocking data */ struct ssc_clock_data { /* CMR div */ unsigned int cmr_div; /* Frame period (as needed by xCMR.PERIOD) */ unsigned int period; /* The SSC clock rate these settings where calculated for */ unsigned long ssc_rate; }; /*-------------------------------------------------------------------------*\ * module data \*-------------------------------------------------------------------------*/ static struct clk *_gclk0; static struct clk *_pll0; #define CODEC_CLK (_gclk0) /*-------------------------------------------------------------------------*\ * Sound SOC operations \*-------------------------------------------------------------------------*/ #if defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE static struct ssc_clock_data playpaq_wm8510_calc_ssc_clock( struct snd_pcm_hw_params *params, struct snd_soc_dai *cpu_dai) { struct at32_ssc_info *ssc_p = snd_soc_dai_get_drvdata(cpu_dai); struct ssc_device *ssc = ssc_p->ssc; struct ssc_clock_data cd; unsigned int rate, width_bits, channels; unsigned int bitrate, ssc_div; unsigned actual_rate; /* * Figure out required bitrate */ rate = params_rate(params); channels = params_channels(params); width_bits = snd_pcm_format_physical_width(params_format(params)); bitrate = rate * width_bits * channels; /* * Figure out required SSC divider and period for required bitrate */ cd.ssc_rate = clk_get_rate(ssc->clk); ssc_div = cd.ssc_rate / bitrate; cd.cmr_div = ssc_div / 2; if (ssc_div & 1) { /* round cmr_div up */ cd.cmr_div++; } cd.period = width_bits - 1; /* * Find actual rate, compare to requested rate */ actual_rate = (cd.ssc_rate / (cd.cmr_div * 2)) / (2 * (cd.period + 1)); pr_debug("playpaq_wm8510: Request rate = %u, actual rate = %u\n", rate, actual_rate); return cd; } #endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct at32_ssc_info *ssc_p = snd_soc_dai_get_drvdata(cpu_dai); struct ssc_device *ssc = ssc_p->ssc; unsigned int pll_out = 0, bclk = 0, mclk_div = 0; int ret; /* Due to difficulties with getting the correct clocks from the AT32's * PLL0, we're going to let the CODEC be in charge of all the clocks */ #if !defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE const unsigned int fmt = (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); #else struct ssc_clock_data cd; const unsigned int fmt = (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); #endif if (ssc == NULL) { pr_warning("playpaq_wm8510_hw_params: ssc is NULL!\n"); return -EINVAL; } /* * Figure out PLL and BCLK dividers for WM8510 */ switch (params_rate(params)) { case 48000: pll_out = 24576000; mclk_div = WM8510_MCLKDIV_2; bclk = WM8510_BCLKDIV_8; break; case 44100: pll_out = 22579200; mclk_div = WM8510_MCLKDIV_2; bclk = WM8510_BCLKDIV_8; break; case 22050: pll_out = 22579200; mclk_div = WM8510_MCLKDIV_4; bclk = WM8510_BCLKDIV_8; break; case 16000: pll_out = 24576000; mclk_div = WM8510_MCLKDIV_6; bclk = WM8510_BCLKDIV_8; break; case 11025: pll_out = 22579200; mclk_div = WM8510_MCLKDIV_8; bclk = WM8510_BCLKDIV_8; break; case 8000: pll_out = 24576000; mclk_div = WM8510_MCLKDIV_12; bclk = WM8510_BCLKDIV_8; break; default: pr_warning("playpaq_wm8510: Unsupported sample rate %d\n", params_rate(params)); return -EINVAL; } /* * set CPU and CODEC DAI configuration */ ret = snd_soc_dai_set_fmt(codec_dai, fmt); if (ret < 0) { pr_warning("playpaq_wm8510: " "Failed to set CODEC DAI format (%d)\n", ret); return ret; } ret = snd_soc_dai_set_fmt(cpu_dai, fmt); if (ret < 0) { pr_warning("playpaq_wm8510: " "Failed to set CPU DAI format (%d)\n", ret); return ret; } /* * Set CPU clock configuration */ #if defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE cd = playpaq_wm8510_calc_ssc_clock(params, cpu_dai); pr_debug("playpaq_wm8510: cmr_div = %d, period = %d\n", cd.cmr_div, cd.period); ret = snd_soc_dai_set_clkdiv(cpu_dai, AT32_SSC_CMR_DIV, cd.cmr_div); if (ret < 0) { pr_warning("playpaq_wm8510: Failed to set CPU CMR_DIV (%d)\n", ret); return ret; } ret = snd_soc_dai_set_clkdiv(cpu_dai, AT32_SSC_TCMR_PERIOD, cd.period); if (ret < 0) { pr_warning("playpaq_wm8510: " "Failed to set CPU transmit period (%d)\n", ret); return ret; } #endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */ /* * Set CODEC clock configuration */ pr_debug("playpaq_wm8510: " "pll_in = %ld, pll_out = %u, bclk = %x, mclk = %x\n", clk_get_rate(CODEC_CLK), pll_out, bclk, mclk_div); #if !defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE ret = snd_soc_dai_set_clkdiv(codec_dai, WM8510_BCLKDIV, bclk); if (ret < 0) { pr_warning ("playpaq_wm8510: Failed to set CODEC DAI BCLKDIV (%d)\n", ret); return ret; } #endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */ ret = snd_soc_dai_set_pll(codec_dai, 0, 0, clk_get_rate(CODEC_CLK), pll_out); if (ret < 0) { pr_warning("playpaq_wm8510: Failed to set CODEC DAI PLL (%d)\n", ret); return ret; } ret = snd_soc_dai_set_clkdiv(codec_dai, WM8510_MCLKDIV, mclk_div); if (ret < 0) { pr_warning("playpaq_wm8510: Failed to set CODEC MCLKDIV (%d)\n", ret); return ret; } return 0; } static struct snd_soc_ops playpaq_wm8510_ops = { .hw_params = playpaq_wm8510_hw_params, }; static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = { SND_SOC_DAPM_MIC("Int Mic", NULL), SND_SOC_DAPM_SPK("Ext Spk", NULL), }; static const struct snd_soc_dapm_route intercon[] = { /* speaker connected to SPKOUT */ {"Ext Spk", NULL, "SPKOUTP"}, {"Ext Spk", NULL, "SPKOUTN"}, {"Mic Bias", NULL, "Int Mic"}, {"MICN", NULL, "Mic Bias"}, {"MICP", NULL, "Mic Bias"}, }; static int playpaq_wm8510_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; int i; /* * Add DAPM widgets */ for (i = 0; i < ARRAY_SIZE(playpaq_dapm_widgets); i++) snd_soc_dapm_new_control(dapm, &playpaq_dapm_widgets[i]); /* * Setup audio path interconnects */ snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); /* always connected pins */ snd_soc_dapm_enable_pin(dapm, "Int Mic"); snd_soc_dapm_enable_pin(dapm, "Ext Spk"); /* Make CSB show PLL rate */ snd_soc_dai_set_clkdiv(rtd->codec_dai, WM8510_OPCLKDIV, WM8510_OPCLKDIV_1 | 4); return 0; } static struct snd_soc_dai_link playpaq_wm8510_dai = { .name = "WM8510", .stream_name = "WM8510 PCM", .cpu_dai_name= "atmel-ssc-dai.0", .platform_name = "atmel-pcm-audio", .codec_name = "wm8510-codec.0-0x1a", .codec_dai_name = "wm8510-hifi", .init = playpaq_wm8510_init, .ops = &playpaq_wm8510_ops, }; static struct snd_soc_card snd_soc_playpaq = { .name = "LRS_PlayPaq_WM8510", .dai_link = &playpaq_wm8510_dai, .num_links = 1, }; static struct platform_device *playpaq_snd_device; static int __init playpaq_asoc_init(void) { int ret = 0; /* * Configure MCLK for WM8510 */ _gclk0 = clk_get(NULL, "gclk0"); if (IS_ERR(_gclk0)) { _gclk0 = NULL; ret = PTR_ERR(_gclk0); goto err_gclk0; } _pll0 = clk_get(NULL, "pll0"); if (IS_ERR(_pll0)) { _pll0 = NULL; ret = PTR_ERR(_pll0); goto err_pll0; } ret = clk_set_parent(_gclk0, _pll0); if (ret) { pr_warning("snd-soc-playpaq: " "Failed to set PLL0 as parent for DAC clock\n"); goto err_set_clk; } clk_set_rate(CODEC_CLK, 12000000); clk_enable(CODEC_CLK); #if defined CONFIG_AT32_ENHANCED_PORTMUX at32_select_periph(MCLK_PIN, MCLK_PERIPH, 0); #endif /* * Create and register platform device */ playpaq_snd_device = platform_device_alloc("soc-audio", 0); if (playpaq_snd_device == NULL) { ret = -ENOMEM; goto err_device_alloc; } platform_set_drvdata(playpaq_snd_device, &snd_soc_playpaq); ret = platform_device_add(playpaq_snd_device); if (ret) { pr_warning("playpaq_wm8510: platform_device_add failed (%d)\n", ret); goto err_device_add; } return 0; err_device_add: if (playpaq_snd_device != NULL) { platform_device_put(playpaq_snd_device); playpaq_snd_device = NULL; } err_device_alloc: err_set_clk: if (_pll0 != NULL) { clk_put(_pll0); _pll0 = NULL; } err_pll0: if (_gclk0 != NULL) { clk_put(_gclk0); _gclk0 = NULL; } return ret; } static void __exit playpaq_asoc_exit(void) { if (_gclk0 != NULL) { clk_put(_gclk0); _gclk0 = NULL; } if (_pll0 != NULL) { clk_put(_pll0); _pll0 = NULL; } #if defined CONFIG_AT32_ENHANCED_PORTMUX at32_free_pin(MCLK_PIN); #endif platform_device_unregister(playpaq_snd_device); playpaq_snd_device = NULL; } module_init(playpaq_asoc_init); module_exit(playpaq_asoc_exit); MODULE_AUTHOR("Geoffrey Wossum <gwossum@acm.org>"); MODULE_DESCRIPTION("ASoC machine driver for LRS PlayPaq"); MODULE_LICENSE("GPL"); Loading
drivers/firmware/sigma.c +58 −23 Original line number Diff line number Diff line Loading @@ -14,13 +14,34 @@ #include <linux/module.h> #include <linux/sigma.h> /* Return: 0==OK, <0==error, =1 ==no more actions */ static size_t sigma_action_size(struct sigma_action *sa) { size_t payload = 0; switch (sa->instr) { case SIGMA_ACTION_WRITEXBYTES: case SIGMA_ACTION_WRITESINGLE: case SIGMA_ACTION_WRITESAFELOAD: payload = sigma_action_len(sa); break; default: break; } payload = ALIGN(payload, 2); return payload + sizeof(struct sigma_action); } /* * Returns a negative error value in case of an error, 0 if processing of * the firmware should be stopped after this action, 1 otherwise. */ static int process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw) process_sigma_action(struct i2c_client *client, struct sigma_action *sa) { struct sigma_action *sa = (void *)(ssfw->fw->data + ssfw->pos); size_t len = sigma_action_len(sa); int ret = 0; int ret; pr_debug("%s: instr:%i addr:%#x len:%zu\n", __func__, sa->instr, sa->addr, len); Loading @@ -29,44 +50,50 @@ process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw) case SIGMA_ACTION_WRITEXBYTES: case SIGMA_ACTION_WRITESINGLE: case SIGMA_ACTION_WRITESAFELOAD: if (ssfw->fw->size < ssfw->pos + len) return -EINVAL; ret = i2c_master_send(client, (void *)&sa->addr, len); if (ret < 0) return -EINVAL; break; case SIGMA_ACTION_DELAY: ret = 0; udelay(len); len = 0; break; case SIGMA_ACTION_END: return 1; return 0; default: return -EINVAL; } /* when arrive here ret=0 or sent data */ ssfw->pos += sigma_action_size(sa, len); return ssfw->pos == ssfw->fw->size; return 1; } static int process_sigma_actions(struct i2c_client *client, struct sigma_firmware *ssfw) { pr_debug("%s: processing %p\n", __func__, ssfw); struct sigma_action *sa; size_t size; int ret; while (ssfw->pos + sizeof(*sa) <= ssfw->fw->size) { sa = (struct sigma_action *)(ssfw->fw->data + ssfw->pos); size = sigma_action_size(sa); ssfw->pos += size; if (ssfw->pos > ssfw->fw->size || size == 0) break; ret = process_sigma_action(client, sa); while (1) { int ret = process_sigma_action(client, ssfw); pr_debug("%s: action returned %i\n", __func__, ret); if (ret == 1) return 0; else if (ret) if (ret <= 0) return ret; } if (ssfw->pos != ssfw->fw->size) return -EINVAL; return 0; } int process_sigma_firmware(struct i2c_client *client, const char *name) Loading @@ -89,16 +116,24 @@ int process_sigma_firmware(struct i2c_client *client, const char *name) /* then verify the header */ ret = -EINVAL; if (fw->size < sizeof(*ssfw_head)) /* * Reject too small or unreasonable large files. The upper limit has been * chosen a bit arbitrarily, but it should be enough for all practical * purposes and having the limit makes it easier to avoid integer * overflows later in the loading process. */ if (fw->size < sizeof(*ssfw_head) || fw->size >= 0x4000000) goto done; ssfw_head = (void *)fw->data; if (memcmp(ssfw_head->magic, SIGMA_MAGIC, ARRAY_SIZE(ssfw_head->magic))) goto done; crc = crc32(0, fw->data, fw->size); crc = crc32(0, fw->data + sizeof(*ssfw_head), fw->size - sizeof(*ssfw_head)); pr_debug("%s: crc=%x\n", __func__, crc); if (crc != ssfw_head->crc) if (crc != le32_to_cpu(ssfw_head->crc)) goto done; ssfw.pos = sizeof(*ssfw_head); Loading
include/linux/sigma.h +4 −9 Original line number Diff line number Diff line Loading @@ -24,7 +24,7 @@ struct sigma_firmware { struct sigma_firmware_header { unsigned char magic[7]; u8 version; u32 crc; __le32 crc; }; enum { Loading @@ -40,19 +40,14 @@ enum { struct sigma_action { u8 instr; u8 len_hi; u16 len; u16 addr; __le16 len; __be16 addr; unsigned char payload[]; }; static inline u32 sigma_action_len(struct sigma_action *sa) { return (sa->len_hi << 16) | sa->len; } static inline size_t sigma_action_size(struct sigma_action *sa, u32 payload_len) { return sizeof(*sa) + payload_len + (payload_len % 2); return (sa->len_hi << 16) | le16_to_cpu(sa->len); } extern int process_sigma_firmware(struct i2c_client *client, const char *name); Loading
sound/soc/atmel/Kconfig +1 −20 Original line number Diff line number Diff line config SND_ATMEL_SOC tristate "SoC Audio for the Atmel System-on-Chip" depends on ARCH_AT91 || AVR32 depends on ARCH_AT91 help Say Y or M if you want to add support for codecs attached to the ATMEL SSC interface. You will also need Loading @@ -24,25 +24,6 @@ config SND_AT91_SOC_SAM9G20_WM8731 Say Y if you want to add support for SoC audio on WM8731-based AT91sam9g20 evaluation board. config SND_AT32_SOC_PLAYPAQ tristate "SoC Audio support for PlayPaq with WM8510" depends on SND_ATMEL_SOC && BOARD_PLAYPAQ && AT91_PROGRAMMABLE_CLOCKS select SND_ATMEL_SOC_SSC select SND_SOC_WM8510 help Say Y or M here if you want to add support for SoC audio on the LRS PlayPaq. config SND_AT32_SOC_PLAYPAQ_SLAVE bool "Run CODEC on PlayPaq in slave mode" depends on SND_AT32_SOC_PLAYPAQ default n help Say Y if you want to run with the AT32 SSC generating the BCLK and FRAME signals on the PlayPaq. Unless you want to play with the AT32 as the SSC master, you probably want to say N here, as this will give you better sound quality. config SND_AT91_SOC_AFEB9260 tristate "SoC Audio support for AFEB9260 board" depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC Loading
sound/soc/atmel/Makefile +0 −4 Original line number Diff line number Diff line Loading @@ -8,9 +8,5 @@ obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o # AT91 Machine Support snd-soc-sam9g20-wm8731-objs := sam9g20_wm8731.o # AT32 Machine Support snd-soc-playpaq-objs := playpaq_wm8510.o obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o obj-$(CONFIG_SND_AT91_SOC_AFEB9260) += snd-soc-afeb9260.o
sound/soc/atmel/playpaq_wm8510.cdeleted 100644 → 0 +0 −473 Original line number Diff line number Diff line /* sound/soc/at32/playpaq_wm8510.c * ASoC machine driver for PlayPaq using WM8510 codec * * Copyright (C) 2008 Long Range Systems * Geoffrey Wossum <gwossum@acm.org> * * 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 code is largely inspired by sound/soc/at91/eti_b1_wm8731.c * * NOTE: If you don't have the AT32 enhanced portmux configured (which * isn't currently in the mainline or Atmel patched kernel), you will * need to set the MCLK pin (PA30) to peripheral A in your board initialization * code. Something like: * at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0); * */ /* #define DEBUG */ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/clk.h> #include <linux/timer.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> #include <mach/at32ap700x.h> #include <mach/portmux.h> #include "../codecs/wm8510.h" #include "atmel-pcm.h" #include "atmel_ssc_dai.h" /*-------------------------------------------------------------------------*\ * constants \*-------------------------------------------------------------------------*/ #define MCLK_PIN GPIO_PIN_PA(30) #define MCLK_PERIPH GPIO_PERIPH_A /*-------------------------------------------------------------------------*\ * data types \*-------------------------------------------------------------------------*/ /* SSC clocking data */ struct ssc_clock_data { /* CMR div */ unsigned int cmr_div; /* Frame period (as needed by xCMR.PERIOD) */ unsigned int period; /* The SSC clock rate these settings where calculated for */ unsigned long ssc_rate; }; /*-------------------------------------------------------------------------*\ * module data \*-------------------------------------------------------------------------*/ static struct clk *_gclk0; static struct clk *_pll0; #define CODEC_CLK (_gclk0) /*-------------------------------------------------------------------------*\ * Sound SOC operations \*-------------------------------------------------------------------------*/ #if defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE static struct ssc_clock_data playpaq_wm8510_calc_ssc_clock( struct snd_pcm_hw_params *params, struct snd_soc_dai *cpu_dai) { struct at32_ssc_info *ssc_p = snd_soc_dai_get_drvdata(cpu_dai); struct ssc_device *ssc = ssc_p->ssc; struct ssc_clock_data cd; unsigned int rate, width_bits, channels; unsigned int bitrate, ssc_div; unsigned actual_rate; /* * Figure out required bitrate */ rate = params_rate(params); channels = params_channels(params); width_bits = snd_pcm_format_physical_width(params_format(params)); bitrate = rate * width_bits * channels; /* * Figure out required SSC divider and period for required bitrate */ cd.ssc_rate = clk_get_rate(ssc->clk); ssc_div = cd.ssc_rate / bitrate; cd.cmr_div = ssc_div / 2; if (ssc_div & 1) { /* round cmr_div up */ cd.cmr_div++; } cd.period = width_bits - 1; /* * Find actual rate, compare to requested rate */ actual_rate = (cd.ssc_rate / (cd.cmr_div * 2)) / (2 * (cd.period + 1)); pr_debug("playpaq_wm8510: Request rate = %u, actual rate = %u\n", rate, actual_rate); return cd; } #endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct at32_ssc_info *ssc_p = snd_soc_dai_get_drvdata(cpu_dai); struct ssc_device *ssc = ssc_p->ssc; unsigned int pll_out = 0, bclk = 0, mclk_div = 0; int ret; /* Due to difficulties with getting the correct clocks from the AT32's * PLL0, we're going to let the CODEC be in charge of all the clocks */ #if !defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE const unsigned int fmt = (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); #else struct ssc_clock_data cd; const unsigned int fmt = (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); #endif if (ssc == NULL) { pr_warning("playpaq_wm8510_hw_params: ssc is NULL!\n"); return -EINVAL; } /* * Figure out PLL and BCLK dividers for WM8510 */ switch (params_rate(params)) { case 48000: pll_out = 24576000; mclk_div = WM8510_MCLKDIV_2; bclk = WM8510_BCLKDIV_8; break; case 44100: pll_out = 22579200; mclk_div = WM8510_MCLKDIV_2; bclk = WM8510_BCLKDIV_8; break; case 22050: pll_out = 22579200; mclk_div = WM8510_MCLKDIV_4; bclk = WM8510_BCLKDIV_8; break; case 16000: pll_out = 24576000; mclk_div = WM8510_MCLKDIV_6; bclk = WM8510_BCLKDIV_8; break; case 11025: pll_out = 22579200; mclk_div = WM8510_MCLKDIV_8; bclk = WM8510_BCLKDIV_8; break; case 8000: pll_out = 24576000; mclk_div = WM8510_MCLKDIV_12; bclk = WM8510_BCLKDIV_8; break; default: pr_warning("playpaq_wm8510: Unsupported sample rate %d\n", params_rate(params)); return -EINVAL; } /* * set CPU and CODEC DAI configuration */ ret = snd_soc_dai_set_fmt(codec_dai, fmt); if (ret < 0) { pr_warning("playpaq_wm8510: " "Failed to set CODEC DAI format (%d)\n", ret); return ret; } ret = snd_soc_dai_set_fmt(cpu_dai, fmt); if (ret < 0) { pr_warning("playpaq_wm8510: " "Failed to set CPU DAI format (%d)\n", ret); return ret; } /* * Set CPU clock configuration */ #if defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE cd = playpaq_wm8510_calc_ssc_clock(params, cpu_dai); pr_debug("playpaq_wm8510: cmr_div = %d, period = %d\n", cd.cmr_div, cd.period); ret = snd_soc_dai_set_clkdiv(cpu_dai, AT32_SSC_CMR_DIV, cd.cmr_div); if (ret < 0) { pr_warning("playpaq_wm8510: Failed to set CPU CMR_DIV (%d)\n", ret); return ret; } ret = snd_soc_dai_set_clkdiv(cpu_dai, AT32_SSC_TCMR_PERIOD, cd.period); if (ret < 0) { pr_warning("playpaq_wm8510: " "Failed to set CPU transmit period (%d)\n", ret); return ret; } #endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */ /* * Set CODEC clock configuration */ pr_debug("playpaq_wm8510: " "pll_in = %ld, pll_out = %u, bclk = %x, mclk = %x\n", clk_get_rate(CODEC_CLK), pll_out, bclk, mclk_div); #if !defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE ret = snd_soc_dai_set_clkdiv(codec_dai, WM8510_BCLKDIV, bclk); if (ret < 0) { pr_warning ("playpaq_wm8510: Failed to set CODEC DAI BCLKDIV (%d)\n", ret); return ret; } #endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */ ret = snd_soc_dai_set_pll(codec_dai, 0, 0, clk_get_rate(CODEC_CLK), pll_out); if (ret < 0) { pr_warning("playpaq_wm8510: Failed to set CODEC DAI PLL (%d)\n", ret); return ret; } ret = snd_soc_dai_set_clkdiv(codec_dai, WM8510_MCLKDIV, mclk_div); if (ret < 0) { pr_warning("playpaq_wm8510: Failed to set CODEC MCLKDIV (%d)\n", ret); return ret; } return 0; } static struct snd_soc_ops playpaq_wm8510_ops = { .hw_params = playpaq_wm8510_hw_params, }; static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = { SND_SOC_DAPM_MIC("Int Mic", NULL), SND_SOC_DAPM_SPK("Ext Spk", NULL), }; static const struct snd_soc_dapm_route intercon[] = { /* speaker connected to SPKOUT */ {"Ext Spk", NULL, "SPKOUTP"}, {"Ext Spk", NULL, "SPKOUTN"}, {"Mic Bias", NULL, "Int Mic"}, {"MICN", NULL, "Mic Bias"}, {"MICP", NULL, "Mic Bias"}, }; static int playpaq_wm8510_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; int i; /* * Add DAPM widgets */ for (i = 0; i < ARRAY_SIZE(playpaq_dapm_widgets); i++) snd_soc_dapm_new_control(dapm, &playpaq_dapm_widgets[i]); /* * Setup audio path interconnects */ snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); /* always connected pins */ snd_soc_dapm_enable_pin(dapm, "Int Mic"); snd_soc_dapm_enable_pin(dapm, "Ext Spk"); /* Make CSB show PLL rate */ snd_soc_dai_set_clkdiv(rtd->codec_dai, WM8510_OPCLKDIV, WM8510_OPCLKDIV_1 | 4); return 0; } static struct snd_soc_dai_link playpaq_wm8510_dai = { .name = "WM8510", .stream_name = "WM8510 PCM", .cpu_dai_name= "atmel-ssc-dai.0", .platform_name = "atmel-pcm-audio", .codec_name = "wm8510-codec.0-0x1a", .codec_dai_name = "wm8510-hifi", .init = playpaq_wm8510_init, .ops = &playpaq_wm8510_ops, }; static struct snd_soc_card snd_soc_playpaq = { .name = "LRS_PlayPaq_WM8510", .dai_link = &playpaq_wm8510_dai, .num_links = 1, }; static struct platform_device *playpaq_snd_device; static int __init playpaq_asoc_init(void) { int ret = 0; /* * Configure MCLK for WM8510 */ _gclk0 = clk_get(NULL, "gclk0"); if (IS_ERR(_gclk0)) { _gclk0 = NULL; ret = PTR_ERR(_gclk0); goto err_gclk0; } _pll0 = clk_get(NULL, "pll0"); if (IS_ERR(_pll0)) { _pll0 = NULL; ret = PTR_ERR(_pll0); goto err_pll0; } ret = clk_set_parent(_gclk0, _pll0); if (ret) { pr_warning("snd-soc-playpaq: " "Failed to set PLL0 as parent for DAC clock\n"); goto err_set_clk; } clk_set_rate(CODEC_CLK, 12000000); clk_enable(CODEC_CLK); #if defined CONFIG_AT32_ENHANCED_PORTMUX at32_select_periph(MCLK_PIN, MCLK_PERIPH, 0); #endif /* * Create and register platform device */ playpaq_snd_device = platform_device_alloc("soc-audio", 0); if (playpaq_snd_device == NULL) { ret = -ENOMEM; goto err_device_alloc; } platform_set_drvdata(playpaq_snd_device, &snd_soc_playpaq); ret = platform_device_add(playpaq_snd_device); if (ret) { pr_warning("playpaq_wm8510: platform_device_add failed (%d)\n", ret); goto err_device_add; } return 0; err_device_add: if (playpaq_snd_device != NULL) { platform_device_put(playpaq_snd_device); playpaq_snd_device = NULL; } err_device_alloc: err_set_clk: if (_pll0 != NULL) { clk_put(_pll0); _pll0 = NULL; } err_pll0: if (_gclk0 != NULL) { clk_put(_gclk0); _gclk0 = NULL; } return ret; } static void __exit playpaq_asoc_exit(void) { if (_gclk0 != NULL) { clk_put(_gclk0); _gclk0 = NULL; } if (_pll0 != NULL) { clk_put(_pll0); _pll0 = NULL; } #if defined CONFIG_AT32_ENHANCED_PORTMUX at32_free_pin(MCLK_PIN); #endif platform_device_unregister(playpaq_snd_device); playpaq_snd_device = NULL; } module_init(playpaq_asoc_init); module_exit(playpaq_asoc_exit); MODULE_AUTHOR("Geoffrey Wossum <gwossum@acm.org>"); MODULE_DESCRIPTION("ASoC machine driver for LRS PlayPaq"); MODULE_LICENSE("GPL");
