diff options
author | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-02 18:24:06 +0000 |
---|---|---|
committer | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-02 18:24:06 +0000 |
commit | e0e5bd88de85c3cfea886944af8652f3d4fbd702 (patch) | |
tree | 98bc91a888e9da99189c063414029c653596a0ac /target/linux/xburst/patches-2.6.35/060-jzcodec.patch | |
parent | 5aabd845f70068fb7e9e1a31653f171581a9103a (diff) |
[xburst] Add 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22463 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst/patches-2.6.35/060-jzcodec.patch')
-rw-r--r-- | target/linux/xburst/patches-2.6.35/060-jzcodec.patch | 594 |
1 files changed, 594 insertions, 0 deletions
diff --git a/target/linux/xburst/patches-2.6.35/060-jzcodec.patch b/target/linux/xburst/patches-2.6.35/060-jzcodec.patch new file mode 100644 index 0000000000..b0d156af0c --- /dev/null +++ b/target/linux/xburst/patches-2.6.35/060-jzcodec.patch @@ -0,0 +1,594 @@ +From 382d2274cfd8fc22064a33681e45668cfb6f91ad Mon Sep 17 00:00:00 2001 +From: Lars-Peter Clausen <lars@metafoo.de> +Date: Sun, 1 Aug 2010 21:14:09 +0200 +Subject: [PATCH] ASoC: Add JZ4740 codec driver + +This patch adds support for the JZ4740 internal codec. + +Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> +Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> +Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> +--- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/jz4740.c | 511 +++++++++++++++++++++++++++++++++++++++++++++ + sound/soc/codecs/jz4740.h | 20 ++ + 4 files changed, 537 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/codecs/jz4740.c + create mode 100644 sound/soc/codecs/jz4740.h + +--- a/sound/soc/codecs/Kconfig ++++ b/sound/soc/codecs/Kconfig +@@ -23,6 +23,7 @@ config SND_SOC_ALL_CODECS + select SND_SOC_AK4671 if I2C + select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC + select SND_SOC_CS4270 if I2C ++ select SND_SOC_JZ4740 if SOC_JZ4740 + select SND_SOC_MAX9877 if I2C + select SND_SOC_DA7210 if I2C + select SND_SOC_PCM3008 +@@ -138,6 +139,9 @@ config SND_SOC_CS4270_VD33_ERRATA + config SND_SOC_CX20442 + tristate + ++config SND_SOC_JZ4740_CODEC ++ tristate ++ + config SND_SOC_L3 + tristate + +--- a/sound/soc/codecs/Makefile ++++ b/sound/soc/codecs/Makefile +@@ -56,6 +56,7 @@ snd-soc-wm9705-objs := wm9705.o + snd-soc-wm9712-objs := wm9712.o + snd-soc-wm9713-objs := wm9713.o + snd-soc-wm-hubs-objs := wm_hubs.o ++snd-soc-jz4740-codec-objs := jz4740.o + + # Amp + snd-soc-max9877-objs := max9877.o +@@ -78,6 +79,7 @@ obj-$(CONFIG_SND_SOC_CS4270) += snd-soc- + obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o + obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o + obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o ++obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o + obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o + obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o + obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o +--- /dev/null ++++ b/sound/soc/codecs/jz4740.c +@@ -0,0 +1,511 @@ ++/* ++ * Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de> ++ * ++ * 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. ++ * ++ * 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., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/platform_device.h> ++#include <linux/slab.h> ++ ++#include <linux/delay.h> ++ ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/pcm_params.h> ++#include <sound/initval.h> ++#include <sound/soc-dapm.h> ++#include <sound/soc.h> ++ ++#define JZ4740_REG_CODEC_1 0x0 ++#define JZ4740_REG_CODEC_2 0x1 ++ ++#define JZ4740_CODEC_1_LINE_ENABLE BIT(29) ++#define JZ4740_CODEC_1_MIC_ENABLE BIT(28) ++#define JZ4740_CODEC_1_SW1_ENABLE BIT(27) ++#define JZ4740_CODEC_1_ADC_ENABLE BIT(26) ++#define JZ4740_CODEC_1_SW2_ENABLE BIT(25) ++#define JZ4740_CODEC_1_DAC_ENABLE BIT(24) ++#define JZ4740_CODEC_1_VREF_DISABLE BIT(20) ++#define JZ4740_CODEC_1_VREF_AMP_DISABLE BIT(19) ++#define JZ4740_CODEC_1_VREF_PULLDOWN BIT(18) ++#define JZ4740_CODEC_1_VREF_LOW_CURRENT BIT(17) ++#define JZ4740_CODEC_1_VREF_HIGH_CURRENT BIT(16) ++#define JZ4740_CODEC_1_HEADPHONE_DISABLE BIT(14) ++#define JZ4740_CODEC_1_HEADPHONE_AMP_CHANGE_ANY BIT(13) ++#define JZ4740_CODEC_1_HEADPHONE_CHARGE BIT(12) ++#define JZ4740_CODEC_1_HEADPHONE_PULLDOWN (BIT(11) | BIT(10)) ++#define JZ4740_CODEC_1_HEADPHONE_POWERDOWN_M BIT(9) ++#define JZ4740_CODEC_1_HEADPHONE_POWERDOWN BIT(8) ++#define JZ4740_CODEC_1_SUSPEND BIT(1) ++#define JZ4740_CODEC_1_RESET BIT(0) ++ ++#define JZ4740_CODEC_1_LINE_ENABLE_OFFSET 29 ++#define JZ4740_CODEC_1_MIC_ENABLE_OFFSET 28 ++#define JZ4740_CODEC_1_SW1_ENABLE_OFFSET 27 ++#define JZ4740_CODEC_1_ADC_ENABLE_OFFSET 26 ++#define JZ4740_CODEC_1_SW2_ENABLE_OFFSET 25 ++#define JZ4740_CODEC_1_DAC_ENABLE_OFFSET 24 ++#define JZ4740_CODEC_1_HEADPHONE_DISABLE_OFFSET 14 ++#define JZ4740_CODEC_1_HEADPHONE_POWERDOWN_OFFSET 8 ++ ++#define JZ4740_CODEC_2_INPUT_VOLUME_MASK 0x1f0000 ++#define JZ4740_CODEC_2_SAMPLE_RATE_MASK 0x000f00 ++#define JZ4740_CODEC_2_MIC_BOOST_GAIN_MASK 0x000030 ++#define JZ4740_CODEC_2_HEADPHONE_VOLUME_MASK 0x000003 ++ ++#define JZ4740_CODEC_2_INPUT_VOLUME_OFFSET 16 ++#define JZ4740_CODEC_2_SAMPLE_RATE_OFFSET 8 ++#define JZ4740_CODEC_2_MIC_BOOST_GAIN_OFFSET 4 ++#define JZ4740_CODEC_2_HEADPHONE_VOLUME_OFFSET 0 ++ ++static const uint32_t jz4740_codec_regs[] = { ++ 0x021b2302, 0x00170803, ++}; ++ ++struct jz4740_codec { ++ void __iomem *base; ++ struct resource *mem; ++ ++ uint32_t reg_cache[2]; ++ struct snd_soc_codec codec; ++}; ++ ++static inline struct jz4740_codec *codec_to_jz4740(struct snd_soc_codec *codec) ++{ ++ return container_of(codec, struct jz4740_codec, codec); ++} ++ ++static unsigned int jz4740_codec_read(struct snd_soc_codec *codec, ++ unsigned int reg) ++{ ++ struct jz4740_codec *jz4740_codec = codec_to_jz4740(codec); ++ return readl(jz4740_codec->base + (reg << 2)); ++} ++ ++static int jz4740_codec_write(struct snd_soc_codec *codec, unsigned int reg, ++ unsigned int val) ++{ ++ struct jz4740_codec *jz4740_codec = codec_to_jz4740(codec); ++ ++ jz4740_codec->reg_cache[reg] = val; ++ writel(val, jz4740_codec->base + (reg << 2)); ++ ++ return 0; ++} ++ ++static const struct snd_kcontrol_new jz4740_codec_controls[] = { ++ SOC_SINGLE("Master Playback Volume", JZ4740_REG_CODEC_2, ++ JZ4740_CODEC_2_HEADPHONE_VOLUME_OFFSET, 3, 0), ++ SOC_SINGLE("Master Capture Volume", JZ4740_REG_CODEC_2, ++ JZ4740_CODEC_2_INPUT_VOLUME_OFFSET, 31, 0), ++ SOC_SINGLE("Master Playback Switch", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_HEADPHONE_DISABLE_OFFSET, 1, 1), ++ SOC_SINGLE("Mic Capture Volume", JZ4740_REG_CODEC_2, ++ JZ4740_CODEC_2_MIC_BOOST_GAIN_OFFSET, 3, 0), ++}; ++ ++static const struct snd_kcontrol_new jz4740_codec_output_controls[] = { ++ SOC_DAPM_SINGLE("Bypass Switch", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_SW1_ENABLE_OFFSET, 1, 0), ++ SOC_DAPM_SINGLE("DAC Switch", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_SW2_ENABLE_OFFSET, 1, 0), ++}; ++ ++static const struct snd_kcontrol_new jz4740_codec_input_controls[] = { ++ SOC_DAPM_SINGLE("Line Capture Switch", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_LINE_ENABLE_OFFSET, 1, 0), ++ SOC_DAPM_SINGLE("Mic Capture Switch", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_MIC_ENABLE_OFFSET, 1, 0), ++}; ++ ++static const struct snd_soc_dapm_widget jz4740_codec_dapm_widgets[] = { ++ SND_SOC_DAPM_ADC("ADC", "Capture", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_ADC_ENABLE_OFFSET, 0), ++ SND_SOC_DAPM_DAC("DAC", "Playback", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_DAC_ENABLE_OFFSET, 0), ++ ++ SND_SOC_DAPM_MIXER("Output Mixer", JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_HEADPHONE_POWERDOWN_OFFSET, 1, ++ jz4740_codec_output_controls, ++ ARRAY_SIZE(jz4740_codec_output_controls)), ++ ++ SND_SOC_DAPM_MIXER_NAMED_CTL("Input Mixer", SND_SOC_NOPM, 0, 0, ++ jz4740_codec_input_controls, ++ ARRAY_SIZE(jz4740_codec_input_controls)), ++ SND_SOC_DAPM_MIXER("Line Input", SND_SOC_NOPM, 0, 0, NULL, 0), ++ ++ SND_SOC_DAPM_OUTPUT("LOUT"), ++ SND_SOC_DAPM_OUTPUT("ROUT"), ++ ++ SND_SOC_DAPM_INPUT("MIC"), ++ SND_SOC_DAPM_INPUT("LIN"), ++ SND_SOC_DAPM_INPUT("RIN"), ++}; ++ ++static const struct snd_soc_dapm_route jz4740_codec_dapm_routes[] = { ++ {"Line Input", NULL, "LIN"}, ++ {"Line Input", NULL, "RIN"}, ++ ++ {"Input Mixer", "Line Capture Switch", "Line Input"}, ++ {"Input Mixer", "Mic Capture Switch", "MIC"}, ++ ++ {"ADC", NULL, "Input Mixer"}, ++ ++ {"Output Mixer", "Bypass Switch", "Input Mixer"}, ++ {"Output Mixer", "DAC Switch", "DAC"}, ++ ++ {"LOUT", NULL, "Output Mixer"}, ++ {"ROUT", NULL, "Output Mixer"}, ++}; ++ ++static int jz4740_codec_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) ++{ ++ uint32_t val; ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_device *socdev = rtd->socdev; ++ struct snd_soc_codec *codec = socdev->card->codec; ++ ++ switch (params_rate(params)) { ++ case 8000: ++ val = 0; ++ break; ++ case 11025: ++ val = 1; ++ break; ++ case 12000: ++ val = 2; ++ break; ++ case 16000: ++ val = 3; ++ break; ++ case 22050: ++ val = 4; ++ break; ++ case 24000: ++ val = 5; ++ break; ++ case 32000: ++ val = 6; ++ break; ++ case 44100: ++ val = 7; ++ break; ++ case 48000: ++ val = 8; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ val <<= JZ4740_CODEC_2_SAMPLE_RATE_OFFSET; ++ ++ snd_soc_update_bits(codec, JZ4740_REG_CODEC_2, ++ JZ4740_CODEC_2_SAMPLE_RATE_MASK, val); ++ ++ return 0; ++} ++ ++static struct snd_soc_dai_ops jz4740_codec_dai_ops = { ++ .hw_params = jz4740_codec_hw_params, ++}; ++ ++struct snd_soc_dai jz4740_codec_dai = { ++ .name = "jz4740", ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = SNDRV_PCM_RATE_8000_48000, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8, ++ }, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = SNDRV_PCM_RATE_8000_48000, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8, ++ }, ++ .ops = &jz4740_codec_dai_ops, ++ .symmetric_rates = 1, ++}; ++EXPORT_SYMBOL_GPL(jz4740_codec_dai); ++ ++static void jz4740_codec_wakeup(struct snd_soc_codec *codec) ++{ ++ int i; ++ uint32_t *cache = codec->reg_cache; ++ ++ snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_RESET, JZ4740_CODEC_1_RESET); ++ udelay(2); ++ ++ snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_SUSPEND | JZ4740_CODEC_1_RESET, 0); ++ ++ for (i = 0; i < ARRAY_SIZE(jz4740_codec_regs); ++i) ++ jz4740_codec_write(codec, i, cache[i]); ++} ++ ++static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec, ++ enum snd_soc_bias_level level) ++{ ++ unsigned int mask; ++ unsigned int value; ++ ++ switch (level) { ++ case SND_SOC_BIAS_ON: ++ break; ++ case SND_SOC_BIAS_PREPARE: ++ mask = JZ4740_CODEC_1_VREF_DISABLE | ++ JZ4740_CODEC_1_VREF_AMP_DISABLE | ++ JZ4740_CODEC_1_HEADPHONE_POWERDOWN_M; ++ value = 0; ++ ++ snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, mask, value); ++ break; ++ case SND_SOC_BIAS_STANDBY: ++ /* The only way to clear the suspend flag is to reset the codec */ ++ if (codec->bias_level == SND_SOC_BIAS_OFF) ++ jz4740_codec_wakeup(codec); ++ ++ mask = JZ4740_CODEC_1_VREF_DISABLE | ++ JZ4740_CODEC_1_VREF_AMP_DISABLE | ++ JZ4740_CODEC_1_HEADPHONE_POWERDOWN_M; ++ value = JZ4740_CODEC_1_VREF_DISABLE | ++ JZ4740_CODEC_1_VREF_AMP_DISABLE | ++ JZ4740_CODEC_1_HEADPHONE_POWERDOWN_M; ++ ++ snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, mask, value); ++ break; ++ case SND_SOC_BIAS_OFF: ++ mask = JZ4740_CODEC_1_SUSPEND; ++ value = JZ4740_CODEC_1_SUSPEND; ++ ++ snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, mask, value); ++ break; ++ default: ++ break; ++ } ++ ++ codec->bias_level = level; ++ ++ return 0; ++} ++ ++static struct snd_soc_codec *jz4740_codec_codec; ++ ++static int jz4740_codec_dev_probe(struct platform_device *pdev) ++{ ++ int ret; ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = jz4740_codec_codec; ++ ++ BUG_ON(!codec); ++ ++ socdev->card->codec = codec; ++ ++ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); ++ if (ret) { ++ dev_err(&pdev->dev, "Failed to create pcms: %d\n", ret); ++ return ret; ++ } ++ ++ snd_soc_add_controls(codec, jz4740_codec_controls, ++ ARRAY_SIZE(jz4740_codec_controls)); ++ ++ snd_soc_dapm_new_controls(codec, jz4740_codec_dapm_widgets, ++ ARRAY_SIZE(jz4740_codec_dapm_widgets)); ++ ++ snd_soc_dapm_add_routes(codec, jz4740_codec_dapm_routes, ++ ARRAY_SIZE(jz4740_codec_dapm_routes)); ++ ++ snd_soc_dapm_new_widgets(codec); ++ ++ return 0; ++} ++ ++static int jz4740_codec_dev_remove(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ ++ snd_soc_free_pcms(socdev); ++ snd_soc_dapm_free(socdev); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PM_SLEEP ++ ++static int jz4740_codec_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->card->codec; ++ ++ return jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_OFF); ++} ++ ++static int jz4740_codec_resume(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->card->codec; ++ ++ return jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY); ++} ++ ++#else ++#define jz4740_codec_suspend NULL ++#define jz4740_codec_resume NULL ++#endif ++ ++struct snd_soc_codec_device soc_codec_dev_jz4740_codec = { ++ .probe = jz4740_codec_dev_probe, ++ .remove = jz4740_codec_dev_remove, ++ .suspend = jz4740_codec_suspend, ++ .resume = jz4740_codec_resume, ++}; ++EXPORT_SYMBOL_GPL(soc_codec_dev_jz4740_codec); ++ ++static int __devinit jz4740_codec_probe(struct platform_device *pdev) ++{ ++ int ret; ++ struct jz4740_codec *jz4740_codec; ++ struct snd_soc_codec *codec; ++ struct resource *mem; ++ ++ jz4740_codec = kzalloc(sizeof(*jz4740_codec), GFP_KERNEL); ++ if (!jz4740_codec) ++ return -ENOMEM; ++ ++ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!mem) { ++ dev_err(&pdev->dev, "Failed to get mmio memory resource\n"); ++ ret = -ENOENT; ++ goto err_free_codec; ++ } ++ ++ mem = request_mem_region(mem->start, resource_size(mem), pdev->name); ++ if (!mem) { ++ dev_err(&pdev->dev, "Failed to request mmio memory region\n"); ++ ret = -EBUSY; ++ goto err_free_codec; ++ } ++ ++ jz4740_codec->base = ioremap(mem->start, resource_size(mem)); ++ if (!jz4740_codec->base) { ++ dev_err(&pdev->dev, "Failed to ioremap mmio memory\n"); ++ ret = -EBUSY; ++ goto err_release_mem_region; ++ } ++ jz4740_codec->mem = mem; ++ ++ jz4740_codec_dai.dev = &pdev->dev; ++ ++ codec = &jz4740_codec->codec; ++ ++ codec->dev = &pdev->dev; ++ codec->name = "jz4740"; ++ codec->owner = THIS_MODULE; ++ ++ codec->read = jz4740_codec_read; ++ codec->write = jz4740_codec_write; ++ codec->set_bias_level = jz4740_codec_set_bias_level; ++ codec->bias_level = SND_SOC_BIAS_OFF; ++ ++ codec->dai = &jz4740_codec_dai; ++ codec->num_dai = 1; ++ ++ codec->reg_cache = jz4740_codec->reg_cache; ++ codec->reg_cache_size = 2; ++ memcpy(codec->reg_cache, jz4740_codec_regs, sizeof(jz4740_codec_regs)); ++ ++ mutex_init(&codec->mutex); ++ INIT_LIST_HEAD(&codec->dapm_widgets); ++ INIT_LIST_HEAD(&codec->dapm_paths); ++ ++ jz4740_codec_codec = codec; ++ ++ snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, ++ JZ4740_CODEC_1_SW2_ENABLE, JZ4740_CODEC_1_SW2_ENABLE); ++ ++ platform_set_drvdata(pdev, jz4740_codec); ++ ++ ret = snd_soc_register_codec(codec); ++ if (ret) { ++ dev_err(&pdev->dev, "Failed to register codec\n"); ++ goto err_iounmap; ++ } ++ ++ ret = snd_soc_register_dai(&jz4740_codec_dai); ++ if (ret) { ++ dev_err(&pdev->dev, "Failed to register codec dai\n"); ++ goto err_unregister_codec; ++ } ++ ++ jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY); ++ ++ return 0; ++ ++err_unregister_codec: ++ snd_soc_unregister_codec(codec); ++err_iounmap: ++ iounmap(jz4740_codec->base); ++err_release_mem_region: ++ release_mem_region(mem->start, resource_size(mem)); ++err_free_codec: ++ kfree(jz4740_codec); ++ ++ return ret; ++} ++ ++static int __devexit jz4740_codec_remove(struct platform_device *pdev) ++{ ++ struct jz4740_codec *jz4740_codec = platform_get_drvdata(pdev); ++ struct resource *mem = jz4740_codec->mem; ++ ++ snd_soc_unregister_dai(&jz4740_codec_dai); ++ snd_soc_unregister_codec(&jz4740_codec->codec); ++ ++ iounmap(jz4740_codec->base); ++ release_mem_region(mem->start, resource_size(mem)); ++ ++ platform_set_drvdata(pdev, NULL); ++ kfree(jz4740_codec); ++ ++ return 0; ++} ++ ++static struct platform_driver jz4740_codec_driver = { ++ .probe = jz4740_codec_probe, ++ .remove = __devexit_p(jz4740_codec_remove), ++ .driver = { ++ .name = "jz4740-codec", ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init jz4740_codec_init(void) ++{ ++ return platform_driver_register(&jz4740_codec_driver); ++} ++module_init(jz4740_codec_init); ++ ++static void __exit jz4740_codec_exit(void) ++{ ++ platform_driver_unregister(&jz4740_codec_driver); ++} ++module_exit(jz4740_codec_exit); ++ ++MODULE_DESCRIPTION("JZ4740 SoC internal codec driver"); ++MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:jz4740-codec"); +--- /dev/null ++++ b/sound/soc/codecs/jz4740.h +@@ -0,0 +1,20 @@ ++/* ++ * Copyright (C) 2009, Lars-Peter Clausen <lars@metafoo.de> ++ * ++ * 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. ++ * ++ * 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., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#ifndef __SND_SOC_CODECS_JZ4740_CODEC_H__ ++#define __SND_SOC_CODECS_JZ4740_CODEC_H__ ++ ++extern struct snd_soc_dai jz4740_codec_dai; ++extern struct snd_soc_codec_device soc_codec_dev_jz4740_codec; ++ ++#endif |