August 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v4 1/1] ALSA: hda - add runtime PM support
by mengdong.lin＠intel.com 23 Aug '12

23 Aug '12

From: Mengdong Lin <mengdong.lin(a)intel.com> Runtime PM can bring more power saving: - When the controller is suspended, its parent device will also have a chance to suspend. - PCI subsystem can choose the lowest power state the controller can signal wake up from. This state can be D3cold on platforms with ACPI PM support. And runtime PM can provide a gerneral sysfs interface for a system policy manager. Runtime PM support is based on current HDA power saving implementation. The user can enable runtime PM on platfroms that provide acceptable latency on transition from D3 to D0. Details: - When both power saving and runtime PM are enabled: -- If a codec supports 'stop-clock' in D3, it will request suspending the controller after it enters D3 and request resuming the controller before back to D0. Thus the controller will be suspended only when all codecs are suspended and support stop-clock in D3. -- User IO operations and HW wakeup signal can resume the controller back to D0. - If runtime PM is disabled, power saving just works as before. - If power saving is disabled, the controller won't be suspended because the power usage counter can never be 0. More about 'stop-clock' feature: If a codec can support targeted pass-through operations in D3 state when there is no BCLK present on the link, it will set CLKSTOP flag in the supported power states and report PS-ClkStopOk when entering D3 state. Please refer to HDA spec section 7.3.3.10 Power state and 7.3.4.12 Supported Power State. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> --- sound/pci/hda/hda_codec.c | 20 ++++++++++-- sound/pci/hda/hda_codec.h | 5 ++- sound/pci/hda/hda_intel.c | 75 +++++++++++++++++++++++++++++++++++---------- 3 files changed, 81 insertions(+), 19 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index f2f5347..72e6328 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -26,6 +26,7 @@ #include <linux/pci.h> #include <linux/mutex.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include <sound/core.h> #include "hda_codec.h" #include <sound/asoundef.h> @@ -1209,6 +1210,9 @@ static void snd_hda_codec_free(struct hda_codec *codec) kfree(codec); } +static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec, + hda_nid_t fg, unsigned int power_state); + static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, unsigned int power_state); @@ -1317,6 +1321,12 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, AC_VERB_GET_SUBSYSTEM_ID, 0); } + codec->d3_stop_clk = snd_hda_codec_get_supported_ps(codec, + codec->afg ? codec->afg : codec->mfg, + AC_PWRST_CLKSTOP); + if (!codec->d3_stop_clk) + bus->power_keep_link_on = 1; + /* power-up all before initialization */ hda_set_power_state(codec, codec->afg ? codec->afg : codec->mfg, @@ -3514,6 +3524,8 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, int count; unsigned int state; + codec->d3_stop_clk_ok = 0; + if (codec->patch_ops.set_power_state) { codec->patch_ops.set_power_state(codec, fg, power_state); return; @@ -3536,6 +3548,10 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, if (!(state & AC_PWRST_ERROR)) break; } + + if ((power_state == AC_PWRST_D3) + && codec->d3_stop_clk && (state & AC_PWRST_CLK_STOP_OK)) + codec->d3_stop_clk_ok = 1; } #ifdef CONFIG_SND_HDA_HWDEP @@ -4385,7 +4401,7 @@ static void hda_power_work(struct work_struct *work) hda_call_codec_suspend(codec); if (bus->ops.pm_notify) - bus->ops.pm_notify(bus); + bus->ops.pm_notify(bus, codec); } static void hda_keep_power_on(struct hda_codec *codec) @@ -4440,7 +4456,7 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down) spin_unlock(&codec->power_lock); if (bus->ops.pm_notify) - bus->ops.pm_notify(bus); + bus->ops.pm_notify(bus, codec); hda_call_codec_resume(codec); spin_lock(&codec->power_lock); diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index fe6206b..b384c721 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -612,7 +612,7 @@ struct hda_bus_ops { void (*bus_reset)(struct hda_bus *bus); #ifdef CONFIG_SND_HDA_POWER_SAVE /* notify power-up/down from codec to controller */ - void (*pm_notify)(struct hda_bus *bus); + void (*pm_notify)(struct hda_bus *bus, struct hda_codec *codec); #endif }; @@ -870,6 +870,9 @@ struct hda_codec { unsigned long power_off_acct; unsigned long power_jiffies; spinlock_t power_lock; + + unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ + unsigned int d3_stop_clk_ok:1; /* BCLK can stop */ #endif /* codec-specific additional proc output */ diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b6a4ea7..2baa3ee 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -46,6 +46,7 @@ #include <linux/mutex.h> #include <linux/reboot.h> #include <linux/io.h> +#include <linux/pm_runtime.h> #ifdef CONFIG_X86 /* for snoop control */ #include <asm/pgtable.h> @@ -1022,7 +1023,7 @@ static unsigned int azx_get_response(struct hda_bus *bus, } #ifdef CONFIG_SND_HDA_POWER_SAVE -static void azx_power_notify(struct hda_bus *bus); +static void azx_power_notify(struct hda_bus *bus, struct hda_codec *codec); #endif /* reset codec link */ @@ -1278,6 +1279,9 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id) u8 sd_status; int i, ok; + if (chip->pci->dev.power.runtime_status != RPM_ACTIVE) + return IRQ_NONE; + spin_lock(&chip->reg_lock); if (chip->disabled) { @@ -2390,23 +2394,17 @@ static void azx_stop_chip(struct azx *chip) #ifdef CONFIG_SND_HDA_POWER_SAVE /* power-up/down the controller */ -static void azx_power_notify(struct hda_bus *bus) +static void azx_power_notify(struct hda_bus *bus, struct hda_codec *codec) { struct azx *chip = bus->private_data; - struct hda_codec *c; - int power_on = 0; - list_for_each_entry(c, &bus->codec_list, list) { - if (c->power_on) { - power_on = 1; - break; - } - } - if (power_on) - azx_init_chip(chip, 1); - else if (chip->running && power_save_controller && - !bus->power_keep_link_on) - azx_stop_chip(chip); + if (bus->power_keep_link_on || !codec->d3_stop_clk_ok) + return; + + if (codec->power_on) + pm_runtime_get_sync(&chip->pci->dev); + else + pm_runtime_put_sync(&chip->pci->dev); } static DEFINE_MUTEX(card_list_lock); @@ -2511,7 +2509,35 @@ static int azx_resume(struct device *dev) snd_power_change_state(card, SNDRV_CTL_POWER_D0); return 0; } -static SIMPLE_DEV_PM_OPS(azx_pm, azx_suspend, azx_resume); + +static int azx_runtime_suspend(struct device *dev) +{ + struct snd_card *card = dev_get_drvdata(dev); + struct azx *chip = card->private_data; + + if (!power_save_controller) + return -EAGAIN; + + azx_stop_chip(chip); + azx_clear_irq_pending(chip); + return 0; +} + +static int azx_runtime_resume(struct device *dev) +{ + struct snd_card *card = dev_get_drvdata(dev); + struct azx *chip = card->private_data; + + azx_init_pci(chip); + azx_init_chip(chip, 1); + return 0; +} + +static const struct dev_pm_ops azx_pm = { + SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) + SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, NULL) +}; + #define AZX_PM_OPS &azx_pm #else #define azx_suspend(dev) @@ -3201,6 +3227,15 @@ static void power_down_all_codecs(struct azx *chip) #endif } +static void rpm_get_all_codecs(struct azx *chip) +{ + struct hda_codec *codec; + + list_for_each_entry(codec, &chip->bus->codec_list, list) { + pm_runtime_get_noresume(&chip->pci->dev); + } +} + static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { @@ -3238,6 +3273,9 @@ static int __devinit azx_probe(struct pci_dev *pci, pci_set_drvdata(pci, card); + if (pci_dev_run_wake(pci)) + pm_runtime_put_noidle(&pci->dev); + dev++; return 0; @@ -3289,6 +3327,7 @@ static int DELAYED_INIT_MARK azx_probe_continue(struct azx *chip) goto out_free; chip->running = 1; + rpm_get_all_codecs(chip); /* all codecs are active */ power_down_all_codecs(chip); azx_notifier_register(chip); azx_add_card_list(chip); @@ -3303,6 +3342,10 @@ out_free: static void __devexit azx_remove(struct pci_dev *pci) { struct snd_card *card = pci_get_drvdata(pci); + + if (pci_dev_run_wake(pci)) + pm_runtime_get_noresume(&pci->dev); + if (card) snd_card_free(card); pci_set_drvdata(pci, NULL); -- 1.7.9.5

2 1

[alsa-devel] [PATCH v3 0/9] ARM/ASoC: OMAP McBSP device tree support
by Peter Ujfalusi 23 Aug '12

23 Aug '12

Hello, Changes since v2: - Replaced the IS_ERR_OR_NULL() with IS_ERR() Changes since v1: - ICLK workaround for the sidetone module has been kept for legacy mode. Intro mail from v2: in order to be able to add DT support for the McBSP driver which is used on all OMAP platforms (OMAP1/2/3/4/5) I needed to make some cleanups to the stack: - Removing callbacks used by the driver for - clock re-parenting (code moved to sound driver) - FSR/CLKR mux configuration (from now on it need to be done at board level) This mux is board specific and depends on the wiring. - Replaced the cpu_is_omap* checks with future proof check. - The FIFO was not enabled on OMAP2430 SoC It has been tested on BeagleBoard (with legacy and DT boot). The series changes McBSP related files mostly. It would be great if the whole series could go via audio tree (if the patches are OK and it is fine by Tony). For DT booted kernel on OMAP3 proper ICLK woraround need to be implemented. At the moment I don't see this as a stopper since we can not properly boot OMAP3 devices (especially rx51 which is using the ST). Other OMAP revisions does not have ST block so the missing workaround is not going to hurt them. I'm working on a solution which can replace the current workaround with a generic implementation to support DT and non DT booted kernels. Regards, Peter --- Peter Ujfalusi (9): ARM/ASoC: omap-mcbsp: Move OMAP2+ clock parenting code to ASoC driver ARM: OMAP: mcbsp: Enable FIFO use for OMAP2430 ARM: OMAP: board-am3517evm: Configure McBSP1 CLKR/FSR signal source ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code ASoC: omap-mcbsp: Remove unused defines ASoC: omap-mcbsp: Remove cpu_is_omap* checks from the code ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data ASoC: omap-mcbsp: Add device tree bindings .../devicetree/bindings/sound/omap-mcbsp.txt | 45 +++++++ arch/arm/mach-omap2/board-am3517evm.c | 13 ++ arch/arm/mach-omap2/mcbsp.c | 126 +------------------ arch/arm/plat-omap/include/plat/mcbsp.h | 2 - sound/soc/omap/am3517evm.c | 20 +--- sound/soc/omap/mcbsp.c | 54 ++++----- sound/soc/omap/mcbsp.h | 3 - sound/soc/omap/omap-mcbsp.c | 106 +++++++++++----- sound/soc/omap/omap-mcbsp.h | 20 --- 9 files changed, 162 insertions(+), 227 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/omap-mcbsp.txt -- 1.7.8.6

5 33

[alsa-devel] [PATCH 0/5] ARM/ASoC: Davinci: Add Device Tree Support
by Hebbar, Gururaja 23 Aug '12

23 Aug '12

This patch-set is a cumulative of below tasks 1. Split asp header into platform and audio specific Davinci driver is shared by few OMAP platforms (like TI81xx, AM335x). Splitting asp header into Davinci platform specific and Audio specific helps to share them across platforms. 2. Add DT support for Davinci Audio Module (McASP, machine, pcm & Codec) This patch was tested on AM18x Board (Tested to check if the commits doesn't break on compile or runtime) and is based on repo at http://git.kernel.org/?p=linux/kernel/git/broonie/sound.git; a=shortlog;h=refs/heads/for-3.7 Note: Matt Porter from TI is working on DMA engine conversion of DaVinci EDMA support and DT conversion of DMA parts will be taken up post that is complete. Since Audio requires DMA to work, this patch set does not yet provide complete functionality required to use sound on DT-based platforms, but is a step towards that direction. Hebbar, Gururaja (5): ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific ASoC: Davinci: McASP: add device tree support for McASP ASoC: Davinci: pcm: Add device tree bindings ASoC: Davinci: machine: Add device tree binding ASoC: tlv320aic3x: Add device tree bindings .../bindings/sound/davinci-evm-audio.txt | 52 ++++++ .../bindings/sound/davinci-mcasp-audio.txt | 43 +++++ .../devicetree/bindings/sound/davinci-pcm.txt | 13 ++ .../devicetree/bindings/sound/tlv320aic3x.txt | 18 ++ arch/arm/mach-davinci/asp.h | 49 +++++ arch/arm/mach-davinci/davinci.h | 3 +- arch/arm/mach-davinci/devices-da8xx.c | 1 + arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- .../linux/platform_data/davinci_asp.h | 73 ++------ sound/soc/codecs/tlv320aic3x.c | 30 +++ sound/soc/davinci/davinci-evm.c | 190 +++++++++++++++++--- sound/soc/davinci/davinci-i2s.c | 3 +- sound/soc/davinci/davinci-mcasp.c | 113 ++++++++++++- sound/soc/davinci/davinci-mcasp.h | 3 +- sound/soc/davinci/davinci-pcm.c | 12 ++- sound/soc/davinci/davinci-pcm.h | 3 +- 20 files changed, 527 insertions(+), 89 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-pcm.txt create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt create mode 100644 arch/arm/mach-davinci/asp.h rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%)

2 17

[alsa-devel] [PATCH v3 2/2] [ALSA] hda - suspend the controller only if all codecs support stop-clk in D3
by mengdong.lin＠intel.com 23 Aug '12

23 Aug '12

From: Mengdong Lin <mengdong.lin(a)intel.com> If a codec can support targeted pass-through operations in D3 state when there is no BCLK present on the link, it will set CLKSTOP flag in the supported power states and report PS-ClkStopOk when entering D3 state. So only if a codec supports this stop-clock feature, it will request suspending the controller after it enters D3 and requst resuming the controller before back to D0. Thus the controller will be suspended only when all codecs are suspended and support stop-clock in D3. Please refer to HDA spec section 7.3.3.10 Power state and 7.3.4.12 Supported Power States. Details: - azx_power_notify() add 'codec' as 2nd parameter to check its stop-clock flag. - each codec count 1 on the controller's power usage counter, and inc/dec the count independently from each other. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> --- sound/pci/hda/hda_codec.c | 23 +++++++++++++++++++++-- sound/pci/hda/hda_codec.h | 5 ++++- sound/pci/hda/hda_intel.c | 25 +++++++++++-------------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index f2f5347..5d09662 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -26,6 +26,7 @@ #include <linux/pci.h> #include <linux/mutex.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include <sound/core.h> #include "hda_codec.h" #include <sound/asoundef.h> @@ -1206,9 +1207,14 @@ static void snd_hda_codec_free(struct hda_codec *codec) kfree(codec->chip_name); kfree(codec->modelname); kfree(codec->wcaps); + /* undo get in snd_hda_codec_new() */ + pm_runtime_put_noidle(&codec->bus->pci->dev); kfree(codec); } +static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec, + hda_nid_t fg, unsigned int power_state); + static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, unsigned int power_state); @@ -1317,10 +1323,17 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, AC_VERB_GET_SUBSYSTEM_ID, 0); } + codec->d3_stop_clk = snd_hda_codec_get_supported_ps(codec, + codec->afg ? codec->afg : codec->mfg, + AC_PWRST_CLKSTOP); + if (!codec->d3_stop_clk) + bus->power_keep_link_on = 1; + /* power-up all before initialization */ hda_set_power_state(codec, codec->afg ? codec->afg : codec->mfg, AC_PWRST_D0); + pm_runtime_get_noresume(&bus->pci->dev); /* active by default */ snd_hda_codec_proc_new(codec); @@ -3514,6 +3527,8 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, int count; unsigned int state; + codec->d3_stop_clk_ok = 0; + if (codec->patch_ops.set_power_state) { codec->patch_ops.set_power_state(codec, fg, power_state); return; @@ -3536,6 +3551,10 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, if (!(state & AC_PWRST_ERROR)) break; } + + if ((power_state == AC_PWRST_D3) + && codec->d3_stop_clk && (state & AC_PWRST_CLK_STOP_OK)) + codec->d3_stop_clk_ok = 1; } #ifdef CONFIG_SND_HDA_HWDEP @@ -4385,7 +4404,7 @@ static void hda_power_work(struct work_struct *work) hda_call_codec_suspend(codec); if (bus->ops.pm_notify) - bus->ops.pm_notify(bus); + bus->ops.pm_notify(bus, codec); } static void hda_keep_power_on(struct hda_codec *codec) @@ -4440,7 +4459,7 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down) spin_unlock(&codec->power_lock); if (bus->ops.pm_notify) - bus->ops.pm_notify(bus); + bus->ops.pm_notify(bus, codec); hda_call_codec_resume(codec); spin_lock(&codec->power_lock); diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index fe6206b..b384c721 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -612,7 +612,7 @@ struct hda_bus_ops { void (*bus_reset)(struct hda_bus *bus); #ifdef CONFIG_SND_HDA_POWER_SAVE /* notify power-up/down from codec to controller */ - void (*pm_notify)(struct hda_bus *bus); + void (*pm_notify)(struct hda_bus *bus, struct hda_codec *codec); #endif }; @@ -870,6 +870,9 @@ struct hda_codec { unsigned long power_off_acct; unsigned long power_jiffies; spinlock_t power_lock; + + unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ + unsigned int d3_stop_clk_ok:1; /* BCLK can stop */ #endif /* codec-specific additional proc output */ diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 4c30fd7..16f037c 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1023,7 +1023,7 @@ static unsigned int azx_get_response(struct hda_bus *bus, } #ifdef CONFIG_SND_HDA_POWER_SAVE -static void azx_power_notify(struct hda_bus *bus); +static void azx_power_notify(struct hda_bus *bus, struct hda_codec *codec); #endif /* reset codec link */ @@ -2394,7 +2394,7 @@ static void azx_stop_chip(struct azx *chip) #ifdef CONFIG_SND_HDA_POWER_SAVE /* power-up/down the controller */ -static void azx_power_notify(struct hda_bus *bus) +static void azx_power_notify(struct hda_bus *bus, struct hda_codec *codec) { struct azx *chip = bus->private_data; struct hda_codec *c; @@ -2406,19 +2406,20 @@ static void azx_power_notify(struct hda_bus *bus) break; } } - if (power_on) { - if (!chip->initialized) - pm_runtime_get_sync(&chip->pci->dev); + + if (!bus->power_keep_link_on + && codec->power_on && codec->d3_stop_clk_ok) + pm_runtime_get_sync(&chip->pci->dev); + + if (power_on) azx_init_chip(chip, 1); - } else if (chip->running && power_save_controller && - !bus->power_keep_link_on) { + !bus->power_keep_link_on) azx_stop_chip(chip); - /* TODO: Suspend controller only if all codec support - stop-clock in D3, for wakeup consideration */ + if (!bus->power_keep_link_on + && !codec->power_on && codec->d3_stop_clk_ok) pm_runtime_put_sync(&chip->pci->dev); - } } static DEFINE_MUTEX(card_list_lock); @@ -3327,7 +3328,6 @@ static int DELAYED_INIT_MARK azx_probe_continue(struct azx *chip) goto out_free; chip->running = 1; - pm_runtime_get_noresume(&chip->pci->dev); /* active by default */ power_down_all_codecs(chip); azx_notifier_register(chip); azx_add_card_list(chip); @@ -3343,9 +3343,6 @@ static void __devexit azx_remove(struct pci_dev *pci) { struct snd_card *card = pci_get_drvdata(pci); - /* undo 'get' in azx_probe_continue() */ - pm_runtime_put_noidle(&pci->dev); - if (pci_dev_run_wake(pci)) pm_runtime_get_noresume(&pci->dev); -- 1.7.9.5

3 4

[alsa-devel] [PATCH] ASoC: omap-mcbsp: Device tree binding documentation update
by Peter Ujfalusi 22 Aug '12

22 Aug '12

To reflect the final devicetree node structure of McBSPs. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hello, the initial OMAP McBSP DT structure was not able to describe the IP (and it's versions) correctly. The main issue was the sidetone block of McBSP2/3 on OMAP3. With this change in the DT description the OS can get the needed information about the IP. The sidetone is still not supported when the Linux kernel is booted with DT since we still depend on hwmod to fill the resources. This patch depend on the McBSP DT support series going via audio tree. Regards, Peter .../devicetree/bindings/sound/omap-mcbsp.txt | 28 +++++++------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/omap-mcbsp.txt b/Documentation/devicetree/bindings/sound/omap-mcbsp.txt index 447cb13..17cce44 100644 --- a/Documentation/devicetree/bindings/sound/omap-mcbsp.txt +++ b/Documentation/devicetree/bindings/sound/omap-mcbsp.txt @@ -8,38 +8,30 @@ Required properties: - reg: Register location and size, for OMAP4+ as an array: <MPU access base address, size>, <L3 interconnect address, size>; +- reg-names: Array of strings associated with the address space - interrupts: Interrupt numbers for the McBSP port, as an array in case the McBSP IP have more interrupt lines: <OCP compliant irq>, <TX irq>, <RX irq>; +- interrupt-names: Array of strings associated with the interrupt numbers - interrupt-parent: The parent interrupt controller - ti,buffer-size: Size of the FIFO on the port (OMAP2430 and newer SoC) - ti,hwmods: Name of the hwmod associated to the McBSP port -Sidetone support for OMAP3 McBSP2 and 3 ports: -- sidetone { }: Within this section the following parameters are required: -- reg: Register location and size for the ST block -- interrupts: The interrupt number for the ST block -- interrupt-parent: The parent interrupt controller for the ST block - Example: mcbsp2: mcbsp@49022000 { compatible = "ti,omap3-mcbsp"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x49022000 0xff>; - interrupts = <0 17 0x4>, /* OCP compliant interrup */ - <0 62 0x4>, /* TX interrup */ - <0 63 0x4>; /* RX interrup */ + reg = <0x49022000 0xff>, + <0x49028000 0xff>; + reg-names = "mpu", "sidetone"; + interrupts = <0 17 0x4>, /* OCP compliant interrupt */ + <0 62 0x4>, /* TX interrupt */ + <0 63 0x4>, /* RX interrupt */ + <0 4 0x4>; /* Sidetone */ + interrupt-names = "common", "tx", "rx", "sidetone"; interrupt-parent = <&intc>; ti,buffer-size = <1280>; ti,hwmods = "mcbsp2"; - - sidetone { - reg = <0x49028000 0xff>; - interrupts = <0 4 0x4>; - interrupt-parent = <&intc>; - }; }; -- 1.7.8.6

2 1

[alsa-devel] [PATCH] ALSA: hda - fix broken HDMI jack detection after S3
by David Henningsson 22 Aug '12

22 Aug '12

The HDMI codec (an NVIDIA one in this case) forgot that its pins were unsol enabled, while it was suspended. Therefore jack detection was broken after S3. With this patch, we reenable the unsol events on resume, and also do an extra check afterwards, to see if the HDMI monitor was plugged/unplugged while in S3. Cc: stable(a)kernel.org (3.3+) BugLink: https://bugs.launchpad.net/bugs/1040030 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_hdmi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 8f23374..6a3ac05 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1315,6 +1315,16 @@ static int generic_hdmi_init(struct hda_codec *codec) return 0; } +#ifdef CONFIG_PM +static int generic_hdmi_resume(struct hda_codec *codec) +{ + snd_hda_codec_resume_cache(codec); + snd_hda_jack_set_dirty_all(codec); + snd_hda_jack_report_sync(codec); + return 0; +} +#endif + static void generic_hdmi_free(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; @@ -1338,6 +1348,9 @@ static const struct hda_codec_ops generic_hdmi_patch_ops = { .build_pcms = generic_hdmi_build_pcms, .build_controls = generic_hdmi_build_controls, .unsol_event = hdmi_unsol_event, +#ifdef CONFIG_PM + .resume = generic_hdmi_resume, +#endif }; static int patch_generic_hdmi(struct hda_codec *codec) -- 1.7.9.5

2 8

[alsa-devel] [PATCH] ASoC: wm9712: Provide TLV information for capture boost controls
by Mark Brown 22 Aug '12

22 Aug '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm9712.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index f6baf9c..1992a62 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -132,8 +132,9 @@ SOC_SINGLE("Aux Playback Phone Volume", AC97_CD, 4, 7, 1), SOC_SINGLE("Phone Volume", AC97_PHONE, 0, 15, 1), SOC_DOUBLE("Line Capture Volume", AC97_LINE, 8, 0, 31, 1), -SOC_SINGLE("Capture 20dB Boost Switch", AC97_REC_SEL, 14, 1, 0), -SOC_SINGLE("Capture to Phone 20dB Boost Switch", AC97_REC_SEL, 11, 1, 1), +SOC_SINGLE_TLV("Capture Boost Switch", AC97_REC_SEL, 14, 1, 0, boost_tlv), +SOC_SINGLE_TLV("Capture to Phone Boost Switch", AC97_REC_SEL, 11, 1, 1, + boost_tlv), SOC_SINGLE("3D Upper Cut-off Switch", AC97_3D_CONTROL, 5, 1, 1), SOC_SINGLE("3D Lower Cut-off Switch", AC97_3D_CONTROL, 4, 1, 1), -- 1.7.10.4

1 0

Re: [alsa-devel] ARM: OMAP: twl-common: Add helper function to register the omap-twl4030 audio driver
by Brian Austin 22 Aug '12

22 Aug '12

Hey guys, This commit 552d9dc316cfedd134ee882cd1ae24ca6934ffc0 breaks the build for OMAP3 Beagelboard. with the following error. CC arch/arm/mach-omap2/twl-common.o arch/arm/mach-omap2/twl-common.c:562: error: conflicting types for ‘omap_twl4030_audio_init’ arch/arm/mach-omap2/twl-common.h:62: error: previous declaration of ‘omap_twl4030_audio_init’ was here make[1]: *** [arch/arm/mach-omap2/twl-common.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 You added a redifinition of omap_twl4030_audio_init in twl-common.c with the extra parameter of sysclk, but the header file has the definition with just the card_name. I'm not sure which way ya'll wanted to go on this so I didnt submit a patch. Just letting it be known. This is off of for-next. Regards, Brian

1 0

[alsa-devel] [PATCH] ALSA: hda - Do not set GPIOs for speakers on IDT if there are no speakers
by David Henningsson 22 Aug '12

22 Aug '12

This fixes an issue with a machine where there were no speakers, but GPIO0 had to be data=1 for the headphone to be functioning. I'm not sure if we need a more advanced patch to solve all possible cases, but if so, this patch would still provide a minor optimisation. BugLink: https://bugs.launchpad.net/bugs/1040077 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_sigmatel.c | 3 +++ 1 file changed, 3 insertions(+) The alsa-info for this machine can not be released yet, sorry. diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index ea5775a..3edd73c 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4543,6 +4543,9 @@ static void stac92xx_line_out_detect(struct hda_codec *codec, struct auto_pin_cfg *cfg = &spec->autocfg; int i; + if (cfg->speaker_outs == 0) + return; + for (i = 0; i < cfg->line_outs; i++) { if (presence) break; -- 1.7.9.5

2 1

[alsa-devel] [PATCHv2.1-CA0132 HDA Codec 2/2] Add DSP loader code to CA0132 codec
by Ian Minett 22 Aug '12

22 Aug '12

From: Ian Minett <ian_minett(a)creativelabs.com> Draft patch to add new DSP loader code, with calls to load_dsp_xxxx() functions. Signed-off-by: Ian Minett <ian_minett(a)creativelabs.com> diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 825f5b4..45dce9c 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1952,22 +1952,13 @@ struct dma_engine { unsigned short m_converter_format; void *m_buffer_addr; unsigned int m_buffer_size; - unsigned int m_req_size; - struct snd_pcm_substream *substream; }; enum dma_state { - DMA_STATE_RESET = 0, - DMA_STATE_STOP = 1, - DMA_STATE_RUN = 2 + DMA_STATE_STOP = 0, + DMA_STATE_RUN = 1 }; -#define azx_pcm_open(a) (a->ops->open(a)) -#define azx_pcm_close(a) (a->ops->close(a)) -#define azx_pcm_prepare(a) (a->ops->prepare(a)) -#define azx_pcm_trigger(a, b) (a->ops->trigger(a, b)) -#define azx_pcm_hw_free(a) (a->ops->hw_free(a)) - static int dma_convert_to_hda_format( struct hda_stream_format *stream_format, unsigned short *hda_format) @@ -1986,113 +1977,6 @@ static int dma_convert_to_hda_format( return 0; } -static int dma_init( - struct hda_codec *codec, - struct dma_engine **pp_dma, - struct hda_stream_format *stream_format, - unsigned short *format, - unsigned int req_size) -{ - struct dma_engine *dma; - struct snd_pcm_substream *substream; - struct snd_pcm *pcm; - struct snd_pcm_runtime *runtime; - unsigned int bits; - snd_pcm_uframes_t frames; - - *pp_dma = NULL; - dma = kzalloc(sizeof(*dma), GFP_KERNEL); - memset((void *)dma, 0, sizeof(*dma)); - - dma_convert_to_hda_format(stream_format, format); - dma->m_converter_format = *format; - - dma->substream = NULL; - pcm = codec->pcm_info->pcm; - for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; - substream; substream = substream->next) { - if (codec->pcm_info->pcm_type == HDA_PCM_TYPE_SPDIF) - continue; - - if (!SUBSTREAM_BUSY(substream)) { - dma->substream = substream; - break; - } - } - - if (NULL == dma->substream) { - kfree(dma); - return -1; - } - - runtime = kzalloc(sizeof(*runtime), GFP_KERNEL); - memset((void *)runtime, 0, sizeof(*runtime)); - dma->substream->runtime = runtime; - dma->substream->private_data = pcm->private_data; - - azx_pcm_open(dma->substream); - req_size = req_size * 2; - snd_pcm_lib_malloc_pages(dma->substream, req_size); - - runtime->rate = stream_format->sample_rate; - runtime->channels = stream_format->number_channels; - runtime->format = SNDRV_PCM_FORMAT_S32_LE; - runtime->no_period_wakeup = 1; - - bits = snd_pcm_format_physical_width(runtime->format); - runtime->sample_bits = bits; - bits *= runtime->channels; - runtime->frame_bits = bits; - frames = 1; - while (bits % 8 != 0) { - bits *= 2; - frames *= 2; - } - runtime->byte_align = bits / 8; - runtime->min_align = frames; - runtime->buffer_size = bytes_to_frames(runtime, req_size); - runtime->period_size = runtime->buffer_size; - dma->m_req_size = req_size; - dma->codec = codec; - - *pp_dma = dma; - CA0132_LOG("dma_init: succeeded.\n"); - return 0; -} - -static int dma_prepare(struct dma_engine *dma) -{ - struct snd_pcm_runtime *runtime; - int err; - - CA0132_LOG("dma_prepare: begin\n"); - runtime = dma->substream->runtime; - - err = azx_pcm_prepare(dma->substream); - if (err < 0) - return -1; - - dma->m_buffer_size = snd_pcm_lib_buffer_bytes(dma->substream); - dma->m_buffer_addr = runtime->dma_area; - - return 0; -} - -static int dma_reset(struct dma_engine *dma) -{ - struct snd_pcm_runtime *runtime = dma->substream->runtime; - - CA0132_LOG("dma_reset: begin\n"); - azx_pcm_hw_free(dma->substream); - snd_pcm_lib_malloc_pages(dma->substream, dma->m_req_size); - - azx_pcm_prepare(dma->substream); - dma->m_buffer_size = snd_pcm_lib_buffer_bytes(dma->substream); - dma->m_buffer_addr = runtime->dma_area; - - return 0; -} - static int dma_set_state(struct dma_engine *dma, enum dma_state state) { int cmd; @@ -2100,9 +1984,6 @@ static int dma_set_state(struct dma_engine *dma, enum dma_state state) CA0132_LOG("dma_set_state state=%d\n", state); switch (state) { - case DMA_STATE_RESET: - dma_reset(dma); - return 0; case DMA_STATE_STOP: cmd = SNDRV_PCM_TRIGGER_STOP; break; @@ -2113,9 +1994,7 @@ static int dma_set_state(struct dma_engine *dma, enum dma_state state) return 0; } - azx_pcm_trigger(dma->substream, cmd); - - return 0; + return load_dsp_trigger(dma->codec->bus, cmd); } static unsigned int dma_get_buffer_size(struct dma_engine *dma) @@ -2128,15 +2007,6 @@ static unsigned int *dma_get_buffer_addr(struct dma_engine *dma) return dma->m_buffer_addr; } -static int dma_free_buffer(struct dma_engine *dma) -{ - azx_pcm_hw_free(dma->substream); - azx_pcm_close(dma->substream); - kfree(dma->substream->runtime); - dma->substream->runtime = NULL; - return 0; -} - static int dma_xfer(struct dma_engine *dma, const unsigned int *data, unsigned int count) @@ -2160,13 +2030,6 @@ static unsigned int dma_get_stream_id(struct dma_engine *dma) return spec->dsp_stream_id; } -static int dma_exit(struct dma_engine *dma) -{ - CA0132_LOG("dma_exit\n"); - kfree(dma); - return 0; -} - /* * CA0132 chip DSP image segment stuffs */ @@ -2384,7 +2247,6 @@ static int dspxfr_one_seg(struct hda_codec *codec, } CA0132_DSP_LOG("+++++ DMA complete"); dma_set_state(dma_engine, DMA_STATE_STOP); - dma_set_state(dma_engine, DMA_STATE_RESET); } CTASSERT(run_size_words <= words_to_write); @@ -2413,17 +2275,29 @@ static int dspxfr_image(struct hda_codec *codec, struct dma_engine *dma_engine; unsigned int dma_chan; unsigned int port_map_mask; - unsigned int buf_size; CTASSERT(fls_data != NULL); if (fls_data == NULL) return -1; - buf_size = ovly ? DSP_DMA_WRITE_BUFLEN_OVLY : DSP_DMA_WRITE_BUFLEN_INIT; - status = dma_init(codec, &dma_engine, format, &hda_format, buf_size); - - if (FAILED(status)) - return -1; + dma_engine = kzalloc(sizeof(*dma_engine), GFP_KERNEL); + if (!dma_engine) { + status = -ENOMEM; + goto exit; + } + memset((void*)dma_engine, 0, sizeof(*dma_engine)); + + dma_engine->codec = codec; + dma_convert_to_hda_format(format, &hda_format); + dma_engine->m_converter_format = hda_format; + dma_engine->m_buffer_size = + ovly ? DSP_DMA_WRITE_BUFLEN_OVLY : DSP_DMA_WRITE_BUFLEN_INIT; + dma_engine->m_buffer_addr = kzalloc(dma_engine->m_buffer_size, + GFP_KERNEL); + if (!dma_engine->m_buffer_addr) { + status = -ENOMEM; + goto exit; + } dma_chan = 0; do { @@ -2434,7 +2308,10 @@ static int dspxfr_image(struct hda_codec *codec, break; } - status = dma_prepare(dma_engine); + status = load_dsp_prepare(codec->bus, + dma_engine->m_converter_format, + dma_engine->m_buffer_addr, + dma_engine->m_buffer_size); if (FAILED(status)) break; @@ -2495,15 +2372,9 @@ static int dspxfr_image(struct hda_codec *codec, if (ovly && (dma_chan != INVALID_DMA_CHANNEL)) status = dspio_free_dma_chan(codec, dma_chan); - status = dma_set_state(dma_engine, DMA_STATE_RESET); - if (FAILED(status)) - status = FAIL_MSG(status, "dma set state Reset fail"); - - status = dma_free_buffer(dma_engine); - if (FAILED(status)) - status = FAIL_MSG(status, "dma free buffer fail"); - - dma_exit(dma_engine); +exit: + kfree(dma_engine->m_buffer_addr); + kfree(dma_engine); return status; } -- 1.7.4.1

2 6