October 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 2/2] ALSA: HDA: Apply SKU override for Acer aspire 7736z
by David Henningsson 14 Oct '10

14 Oct '10

BugLink: http://launchpad.net/bugs/617647 The current SKU value disables playback, so ignore the SKU value. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

1 0

[alsa-devel] [PATCH 1/2] ALSA: HDA: Enable SKU quirks for Realtek
by David Henningsson 14 Oct '10

14 Oct '10

Realtek have ways of specifying external amps and more via a special nid or via the Codec's subsystem ID, this is called "SKU". The computer manufacturer sometimes gets this wrong, so we need to be able to override or ignore the SKU customization value. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

1 0

[PATCH 2/2] ALSA: HDA: Apply SKU override for Acer aspire 7736z
by David Henningsson 14 Oct '10

14 Oct '10

BugLink: http://launchpad.net/bugs/617647 The current SKU value disables playback, so ignore the SKU value. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f826bad..1c82c59 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10627,6 +10627,7 @@ static struct alc_config_preset alc882_presets[] = { enum { PINFIX_ABIT_AW9D_MAX, PINFIX_PB_M5210, + PINFIX_ACER_ASPIRE_7736, }; static const struct alc_fixup alc882_fixups[] = { @@ -10644,11 +10645,15 @@ static const struct alc_fixup alc882_fixups[] = { {} } }, + [PINFIX_ACER_ASPIRE_7736] = { + .sku = ALC_FIXUP_SKU_IGNORE, + }, }; static struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", PINFIX_PB_M5210), SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX), + SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736), {} }; -- 1.7.1 --------------010108070807070605080900--

1 0

[PATCH 1/2] ALSA: HDA: Enable SKU quirks for Realtek
by David Henningsson 14 Oct '10

14 Oct '10

Realtek have ways of specifying external amps and more via a special nid or via the Codec's subsystem ID, this is called "SKU". The computer manufacturer sometimes gets this wrong, so we need to be able to override or ignore the SKU customization value. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b4e0959..f826bad 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -301,6 +301,7 @@ struct alc_customize_define { unsigned int platform_type:1; unsigned int swap:1; unsigned int override:1; + unsigned int fixup:1; /* Means that this sku is set by driver, not read from hw */ }; struct alc_spec { @@ -1464,6 +1465,10 @@ static void alc_init_auto_mic(struct hda_codec *codec) spec->unsol_event = alc_sku_unsol_event; } +/* Could be any non-zero and even value. When used as fixup, tells + the driver to ignore any present sku defines. */ +#define ALC_FIXUP_SKU_IGNORE (2) + static int alc_auto_parse_customize_define(struct hda_codec *codec) { unsigned int ass, tmp, i; @@ -1472,6 +1477,13 @@ static int alc_auto_parse_customize_define(struct hda_codec *codec) spec->cdefine.enable_pcbeep = 1; /* assume always enabled */ + if (spec->cdefine.fixup) { + ass = spec->cdefine.sku_cfg; + if (ass == ALC_FIXUP_SKU_IGNORE) + return -1; + goto do_sku; + } + ass = codec->subsystem_id & 0xffff; if (ass != codec->bus->pci->subsystem_device && (ass & 1)) goto do_sku; @@ -1539,6 +1551,13 @@ static int alc_subsystem_id(struct hda_codec *codec, unsigned nid; struct alc_spec *spec = codec->spec; + if (spec->cdefine.fixup) { + ass = spec->cdefine.sku_cfg; + if (ass == ALC_FIXUP_SKU_IGNORE) + return 0; + goto do_sku; + } + ass = codec->subsystem_id & 0xffff; if ((ass != codec->bus->pci->subsystem_device) && (ass & 1)) goto do_sku; @@ -1658,6 +1677,7 @@ struct alc_pincfg { }; struct alc_fixup { + unsigned int sku; const struct alc_pincfg *pins; const struct hda_verb *verbs; }; @@ -1668,12 +1688,22 @@ static void alc_pick_fixup(struct hda_codec *codec, int pre_init) { const struct alc_pincfg *cfg; + struct alc_spec *spec; quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk); if (!quirk) return; fix += quirk->value; cfg = fix->pins; + if (pre_init && fix->sku) { +#ifdef CONFIG_SND_DEBUG_VERBOSE + snd_printdd(KERN_INFO "hda_codec: %s: Apply sku override for %s\n", + codec->chip_name, quirk->name); +#endif + spec = codec->spec; + spec->cdefine.sku_cfg = fix->sku; + spec->cdefine.fixup = 1; + } if (pre_init && cfg) { #ifdef CONFIG_SND_DEBUG_VERBOSE snd_printdd(KERN_INFO "hda_codec: %s: Apply pincfg for %s\n", @@ -10861,8 +10891,6 @@ static int patch_alc882(struct hda_codec *codec) codec->spec = spec; - alc_auto_parse_customize_define(codec); - switch (codec->vendor_id) { case 0x10ec0882: case 0x10ec0885: @@ -10890,6 +10918,8 @@ static int patch_alc882(struct hda_codec *codec) if (board_config == ALC882_AUTO) alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 1); + alc_auto_parse_customize_define(codec); + if (board_config == ALC882_AUTO) { /* automatic parse from the BIOS config */ err = alc882_parse_auto_config(codec); -- 1.7.1 --------------060604060706050204090703--

1 0

Re: [alsa-devel] USB asynchronous mode feedback format
by Julian Scheel 14 Oct '10

14 Oct '10

Am Donnerstag, 14. Oktober 2010, 13:15:45 schrieb Alex: > > Great to hear that ASYNC OUT with rate feedback is working for u now :-) > > Btw, are u using 12.13 format for Linux ? U can try with OSX snow leopard, > which can understand 10.14 and 16.16. Apply Clemens' patch and linux can > understand all formats - but users will have to wait for kernel 2.6.37 ! I changed my code to do 12.13 format now. Will try to connect it to my MacBook later. > I have implemented a sophisticated rate feedback with ping pong audio > buffer, calculation of gap between USB data and i2s data, determining > whether gap is increasing or decreasing etc. This actually looks like a good approach. Just studying your code. > Channel inversion is a known issue and u need to sync the channel to the > LRCK, and resync when the USB stream is stopped and restarted and when > doing sample rate changes (48 to 96 etc). So far I only support one fixed sample rate (48 kHz) in the device. Regarding the sync I am wondering how to determine the alignment of the data coming from USB. Is there some way to be sure that the data frames do start with the left channel when reading them from USB? The output to the I2S is done in bigger chunks through the DMA engine of the AT91SAM7 - it might be possible that I loose one packet in some case at this place... This would actually cause a inversion on the channels... > As for i2s for the DAC etc, u need to have the right timing for the various > clocks. As Daniel suggested, u need to scope the signals with a dual > trace scope to see whether u are giving the DAC and other chips the right > timing. See my other mail with the attached measurement. > If u are interested, u can take a look at our open source project > sdr-widget. Google for it. Yep, I just discovered it. Really nice project. Covers even more than I want to do. My goal is only to have a 192kHz/24bit USB->I2S brige which can be used for high quality audio designs. If I would have seen your project before I might not even have started working on this. Well, now it's topic of my bachelor thesis, so I really should get this done (c: Regards, Julian

2 1

[alsa-devel] USB asynchronous mode feedback format
by Julian Scheel 14 Oct '10

14 Oct '10

Hi, I am currently working on an USB-Audio device based on a AT91SAM7 processor. Actually I am currently trying to get the asynchronous mode working, to be able to use the AT91SAM7 as I2S transmitter in slave mode, utilizing and external clock. So I added the endpoint descriptors for the Feedback pipe. I attached the lsusb output. Alsa detects the card properly and reports it to be async in the /proc/asound interface. Now for a first tested I am trying to report back a constant rate through the feedback pipe. The stream is 48kHz with 16Bit. Reading the USB Audio 1.0 spec I assume in theory for a 48kHz stream I would report a rate of 48 samples per frame to the host, compensated by the measured drift. As the data should be 10.14 encoded I currently send { 0x0c, 0x00, 0x00 } on the feedback pipe whenever it is queried, which happens whenever I try to play some stream on this device. But unfortunately the host won't send any data to the device. I am wondering what might be wrong and where to check that alsa received the feedback data properly? I would be really thankful for any help! Regards, Julian

3 4

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 14 Oct '10

14 Oct '10

The following changes since commit fe3e2e7ff2da41bd7a985c4c206e05a95ebe7a6b: ASoC: checking kzalloc() for IS_ERR() instead of NULL (2010-10-11 12:38:21 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 Kuninori Morimoto (6): ASoC: ak4642: simultaneous playback/recorde support ASoC: fsi: Add fsi_get_frame_width function ASoC: fsi: remove un-necessary variable from fsi_dai_startup ASoC: fsi: avoid un-necessary status read ASoC: fsi: Add new macro and shift for PortA/B In/Out ASoC: Add fsi_is_play function Mark Brown (5): ASoC: Add WM8962 microphone bias control ASoC: Restore DAI ID specification for WM8994 ASoC: Move soc-core module init next to functon definition ASoC: Check list debugfs files for PAGE_SIZE overflow ASoC: Pay attention to driver supplied DAI IDs Mika Westerberg (3): ASoC: ac97: don't call snd_soc_new_ac97_codec at probe ASoC: don't register AC97 devices twice ASoC: ac97: add MODULE_ALIAS for the platform driver include/sound/soc.h | 1 + sound/soc/codecs/ac97.c | 7 +--- sound/soc/codecs/ak4642.c | 8 ++-- sound/soc/codecs/wm8962.c | 2 + sound/soc/codecs/wm8994.c | 3 ++ sound/soc/sh/fsi.c | 74 +++++++++++++++++++++++++------------------- sound/soc/soc-core.c | 75 ++++++++++++++++++++++++++++++++++----------- 7 files changed, 110 insertions(+), 60 deletions(-)

2 1

[alsa-devel] [PATCH v3 4/6] ARM: S5P: Add EPLL rate change warning
by Seungwhan Youn 14 Oct '10

14 Oct '10

This patch adds warning about changing EPLL rate to notice that other driver that controls H/W, which is using EPLL, will has unknown effects by this EPLL rate change. Signed-off-by: Seungwhan Youn <sw.youn(a)samsung.com> --- This patch is re-worked to avoid conflict with previous re-worked patch( [PATCH v3 1/6] ARM: S5P: Reduce duplicated EPLL control codes). This patch also depends on previous v1 and v2 petch-set which was accepted, and depends on re-workd patch v3 1/6. -- arch/arm/mach-s5p64x0/clock-s5p6440.c | 3 +++ arch/arm/mach-s5p64x0/clock-s5p6450.c | 3 +++ arch/arm/mach-s5pc100/clock.c | 3 +++ arch/arm/mach-s5pv210/clock.c | 3 +++ 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index cfccdff..0d728d3 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c @@ -79,6 +79,9 @@ static int s5p6440_epll_set_rate(struct clk *clk, unsigned long rate) __raw_writel(epll_con, S5P64X0_EPLL_CON); __raw_writel(epll_con_k, S5P64X0_EPLL_CON_K); + printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n", + clk->rate, rate); + clk->rate = rate; return 0; diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index f1498d3..1b9b0f9 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c @@ -80,6 +80,9 @@ static int s5p6450_epll_set_rate(struct clk *clk, unsigned long rate) __raw_writel(epll_con, S5P64X0_EPLL_CON); __raw_writel(epll_con_k, S5P64X0_EPLL_CON_K); + printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n", + clk->rate, rate); + clk->rate = rate; return 0; diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c index 42c2636..9e192a0 100644 --- a/arch/arm/mach-s5pc100/clock.c +++ b/arch/arm/mach-s5pc100/clock.c @@ -323,6 +323,9 @@ static int s5pc100_epll_set_rate(struct clk *clk, unsigned long rate) __raw_writel(epll_con, S5P_EPLL_CON); + printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n", + clk->rate, rate); + clk->rate = rate; return 0; diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index fdfadac..25eb839 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c @@ -1066,6 +1066,9 @@ static int s5pv210_epll_set_rate(struct clk *clk, unsigned long rate) __raw_writel(epll_con, S5P_EPLL_CON); __raw_writel(epll_con_k, S5P_EPLL_CON1); + printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n", + clk->rate, rate); + clk->rate = rate; return 0; -- 1.6.2.5

2 1

[alsa-devel] [PATCH v3 1/6] ARM: S5P: Reduce duplicated EPLL control codes
by Seungwhan Youn 14 Oct '10

14 Oct '10

S5P Samsung SoCs has a EPLL to support various PLL clock sources for other H/W blocks. Until now, to control EPLL, each of SoCs make their own functions in 'mach-s5pxxx/clock.c'. But some of functions, 'xxx_epll_get_rate()' and 'xxx_epll_enable()', are exactly same in all S5P SoCs, so this patch move these duplicated codes to common EPLL functions that use platform wide. Signed-off-by: Seungwhan Youn <sw.youn(a)samsung.com> --- This patch is re-worked followings, requested by Kukjin Kim, from v2 :- o Set re-define S5P_EPLL_CON with specific EPLL definations on S5P platform. o and, keep original EPLL definations. And also, this patch depends on v1 patch-set which was submitted. o [PATCH 1/10] ARM: S5PC100: Add S/PDIF platform device o [PATCH 2/10] ARM: S5PC100: Modify SCLK_AUDIO{0,1,2} clock as sysclks o [PATCH 3/10] ARM: S5PC100: Add SCLK_SPDIF clock o [PATCH 4/10] ARM: S5PV210: Add S/PDIF platform device o [PATCH 5/10] ARM: S5PV210: Add SCLK_SPDIF clock o [PATCH 6/10] ARM: S5PV210: Add audio clocks as sysclk -- arch/arm/mach-s5p64x0/clock-s5p6440.c | 4 ++-- arch/arm/mach-s5p64x0/clock-s5p6450.c | 4 ++-- arch/arm/mach-s5p64x0/clock.c | 18 ------------------ arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 2 ++ arch/arm/mach-s5pc100/clock.c | 22 ++-------------------- arch/arm/mach-s5pv310/include/mach/regs-clock.h | 4 ++++ arch/arm/plat-s5p/clock.c | 20 ++++++++++++++++++++ arch/arm/plat-s5p/include/plat/s5p-clock.h | 4 ++++ 8 files changed, 36 insertions(+), 42 deletions(-) diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index f93dcd8..cfccdff 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c @@ -85,7 +85,7 @@ static int s5p6440_epll_set_rate(struct clk *clk, unsigned long rate) } static struct clk_ops s5p6440_epll_ops = { - .get_rate = s5p64x0_epll_get_rate, + .get_rate = s5p_epll_get_rate, .set_rate = s5p6440_epll_set_rate, }; @@ -548,7 +548,7 @@ void __init_or_cpufreq s5p6440_setup_clocks(void) /* Set S5P6440 functions for clk_fout_epll */ - clk_fout_epll.enable = s5p64x0_epll_enable; + clk_fout_epll.enable = s5p_epll_enable; clk_fout_epll.ops = &s5p6440_epll_ops; clk_48m.enable = s5p64x0_clk48m_ctrl; diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index f9afb05..f1498d3 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c @@ -86,7 +86,7 @@ static int s5p6450_epll_set_rate(struct clk *clk, unsigned long rate) } static struct clk_ops s5p6450_epll_ops = { - .get_rate = s5p64x0_epll_get_rate, + .get_rate = s5p_epll_get_rate, .set_rate = s5p6450_epll_set_rate, }; @@ -581,7 +581,7 @@ void __init_or_cpufreq s5p6450_setup_clocks(void) /* Set S5P6450 functions for clk_fout_epll */ - clk_fout_epll.enable = s5p64x0_epll_enable; + clk_fout_epll.enable = s5p_epll_enable; clk_fout_epll.ops = &s5p6450_epll_ops; clk_48m.enable = s5p64x0_clk48m_ctrl; diff --git a/arch/arm/mach-s5p64x0/clock.c b/arch/arm/mach-s5p64x0/clock.c index 523ba80..b52c6e2 100644 --- a/arch/arm/mach-s5p64x0/clock.c +++ b/arch/arm/mach-s5p64x0/clock.c @@ -73,24 +73,6 @@ static const u32 clock_table[][3] = { {L2 * 1000, (3 << ARM_DIV_RATIO_SHIFT), (0 << S5P64X0_CLKDIV0_HCLK_SHIFT)}, }; -int s5p64x0_epll_enable(struct clk *clk, int enable) -{ - unsigned int ctrlbit = clk->ctrlbit; - unsigned int epll_con = __raw_readl(S5P64X0_EPLL_CON) & ~ctrlbit; - - if (enable) - __raw_writel(epll_con | ctrlbit, S5P64X0_EPLL_CON); - else - __raw_writel(epll_con, S5P64X0_EPLL_CON); - - return 0; -} - -unsigned long s5p64x0_epll_get_rate(struct clk *clk) -{ - return clk->rate; -} - unsigned long s5p64x0_armclk_get_rate(struct clk *clk) { unsigned long rate = clk_get_rate(clk->parent); diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-clock.h b/arch/arm/mach-s5p64x0/include/mach/regs-clock.h index 58e1bc8..a133f22 100644 --- a/arch/arm/mach-s5p64x0/include/mach/regs-clock.h +++ b/arch/arm/mach-s5p64x0/include/mach/regs-clock.h @@ -60,4 +60,6 @@ #define ARM_DIV_RATIO_SHIFT 0 #define ARM_DIV_MASK (0xF << ARM_DIV_RATIO_SHIFT) +#define S5P_EPLL_CON S5P64X0_EPLL_CON + #endif /* __ASM_ARCH_REGS_CLOCK_H */ diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c index 306ae74..42c2636 100644 --- a/arch/arm/mach-s5pc100/clock.c +++ b/arch/arm/mach-s5pc100/clock.c @@ -273,24 +273,6 @@ static struct clksrc_clk clk_div_hdmi = { .reg_div = { .reg = S5P_CLK_DIV3, .shift = 28, .size = 4 }, }; -static int s5pc100_epll_enable(struct clk *clk, int enable) -{ - unsigned int ctrlbit = clk->ctrlbit; - unsigned int epll_con = __raw_readl(S5P_EPLL_CON) & ~ctrlbit; - - if (enable) - __raw_writel(epll_con | ctrlbit, S5P_EPLL_CON); - else - __raw_writel(epll_con, S5P_EPLL_CON); - - return 0; -} - -static unsigned long s5pc100_epll_get_rate(struct clk *clk) -{ - return clk->rate; -} - static u32 epll_div[][4] = { { 32750000, 131, 3, 4 }, { 32768000, 131, 3, 4 }, @@ -347,7 +329,7 @@ static int s5pc100_epll_set_rate(struct clk *clk, unsigned long rate) } static struct clk_ops s5pc100_epll_ops = { - .get_rate = s5pc100_epll_get_rate, + .get_rate = s5p_epll_get_rate, .set_rate = s5pc100_epll_set_rate, }; @@ -1261,7 +1243,7 @@ void __init_or_cpufreq s5pc100_setup_clocks(void) unsigned int ptr; /* Set S5PC100 functions for clk_fout_epll */ - clk_fout_epll.enable = s5pc100_epll_enable; + clk_fout_epll.enable = s5p_epll_enable; clk_fout_epll.ops = &s5pc100_epll_ops; printk(KERN_DEBUG "%s: registering clocks\n", __func__); diff --git a/arch/arm/mach-s5pv310/include/mach/regs-clock.h b/arch/arm/mach-s5pv310/include/mach/regs-clock.h index 5d0bb40..9e9e44c 100644 --- a/arch/arm/mach-s5pv310/include/mach/regs-clock.h +++ b/arch/arm/mach-s5pv310/include/mach/regs-clock.h @@ -157,4 +157,8 @@ #define S5P_CLKDIV_BUS_GPLR_SHIFT (4) #define S5P_CLKDIV_BUS_GPLR_MASK (0x7 << S5P_CLKDIV_BUS_GPLR_SHIFT) +/* Compatibility defines */ + +#define S5P_EPLL_CON S5P_EPLL_CON0 + #endif /* __ASM_ARCH_REGS_CLOCK_H */ diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c index 8188009..8d081d9 100644 --- a/arch/arm/plat-s5p/clock.c +++ b/arch/arm/plat-s5p/clock.c @@ -21,6 +21,8 @@ #include <linux/io.h> #include <asm/div64.h> +#include <mach/regs-clock.h> + #include <plat/clock.h> #include <plat/clock-clksrc.h> #include <plat/s5p-clock.h> @@ -148,6 +150,24 @@ int s5p_gatectrl(void __iomem *reg, struct clk *clk, int enable) return 0; } +int s5p_epll_enable(struct clk *clk, int enable) +{ + unsigned int ctrlbit = clk->ctrlbit; + unsigned int epll_con = __raw_readl(S5P_EPLL_CON) & ~ctrlbit; + + if (enable) + __raw_writel(epll_con | ctrlbit, S5P_EPLL_CON); + else + __raw_writel(epll_con, S5P_EPLL_CON); + + return 0; +} + +unsigned long s5p_epll_get_rate(struct clk *clk) +{ + return clk->rate; +} + static struct clk *s5p_clks[] __initdata = { &clk_ext_xtal_mux, &clk_48m, diff --git a/arch/arm/plat-s5p/include/plat/s5p-clock.h b/arch/arm/plat-s5p/include/plat/s5p-clock.h index 17036c8..2b6dcff 100644 --- a/arch/arm/plat-s5p/include/plat/s5p-clock.h +++ b/arch/arm/plat-s5p/include/plat/s5p-clock.h @@ -43,4 +43,8 @@ extern struct clksrc_sources clk_src_dpll; extern int s5p_gatectrl(void __iomem *reg, struct clk *clk, int enable); +/* Common EPLL operations for S5P platform */ +extern int s5p_epll_enable(struct clk *clk, int enable); +extern unsigned long s5p_epll_get_rate(struct clk *clk); + #endif /* __ASM_PLAT_S5P_CLOCK_H */ -- 1.6.2.5

2 1

[alsa-devel] [patch 0/3] ALC562[123] / t5325 sound support - try 2
by Arnaud Patard 13 Oct '10

13 Oct '10

Hi, Here is a new try to get merged sound support for the alc562[123] codecs and HP's t5325 thin client merged. Not a lot of changes since last try. All of them are to address the comments I had. Thanks, Arnaud

2 13