March 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: rt5640: add an of_match table
by Stephen Warren 31 Mar '14

31 Mar '14

From: Stephen Warren <swarren(a)nvidia.com> Add a device tree match table. This serves to make the driver's support of device tree more explicit. Perhaps the fallback for DT matching to using the i2c_device_id table will go away one day, since it fails in face of devices from different vendors with the same name. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/codecs/rt5640.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index b5014a2024e2..b6a02c16f100 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2018,6 +2018,14 @@ static const struct i2c_device_id rt5640_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); +#if defined(CONFIG_OF) +static const struct of_device_id rt5640_of_match[] = { + { .compatible = "realtek,rt5640", }, + {}, +}; +MODULE_DEVICE_TABLE(of, rt5640_of_match); +#endif + #ifdef CONFIG_ACPI static struct acpi_device_id rt5640_acpi_match[] = { { "INT33CA", 0 }, @@ -2166,6 +2174,7 @@ static struct i2c_driver rt5640_i2c_driver = { .name = "rt5640", .owner = THIS_MODULE, .acpi_match_table = ACPI_PTR(rt5640_acpi_match), + .of_match_table = of_match_ptr(rt5640_of_match), }, .probe = rt5640_i2c_probe, .remove = rt5640_i2c_remove, -- 1.8.1.5

3 3

[alsa-devel] [PATCH] ASoC: rt5640: Use the platform data for DMIC settings
by Oder Chiou 31 Mar '14

31 Mar '14

The patch uses the platform data for DMIC settings. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- include/sound/rt5640.h | 4 +++ sound/soc/codecs/rt5640.c | 77 ++++++++++++++--------------------------------- 2 files changed, 27 insertions(+), 54 deletions(-) diff --git a/include/sound/rt5640.h b/include/sound/rt5640.h index 27cc75e..59d26dd 100644 --- a/include/sound/rt5640.h +++ b/include/sound/rt5640.h @@ -16,6 +16,10 @@ struct rt5640_platform_data { bool in1_diff; bool in2_diff; + bool dmic_en; + bool dmic1_data_pin; /* 0 = IN1P; 1 = GPIO3 */ + bool dmic2_data_pin; /* 0 = IN1N; 1 = GPIO4 */ + int ldo1_en; /* GPIO for LDO1_EN */ }; diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index bcd6513..cf041e3 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -872,54 +872,6 @@ static SOC_ENUM_SINGLE_DECL(rt5640_sdi_sel_enum, RT5640_I2S2_SDP, static const struct snd_kcontrol_new rt5640_sdi_mux = SOC_DAPM_ENUM("SDI select", rt5640_sdi_sel_enum); -static int rt5640_set_dmic1_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - struct snd_soc_codec *codec = w->codec; - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - snd_soc_update_bits(codec, RT5640_GPIO_CTRL1, - RT5640_GP2_PIN_MASK | RT5640_GP3_PIN_MASK, - RT5640_GP2_PIN_DMIC1_SCL | RT5640_GP3_PIN_DMIC1_SDA); - snd_soc_update_bits(codec, RT5640_DMIC, - RT5640_DMIC_1L_LH_MASK | RT5640_DMIC_1R_LH_MASK | - RT5640_DMIC_1_DP_MASK, - RT5640_DMIC_1L_LH_FALLING | RT5640_DMIC_1R_LH_RISING | - RT5640_DMIC_1_DP_IN1P); - break; - - default: - return 0; - } - - return 0; -} - -static int rt5640_set_dmic2_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - struct snd_soc_codec *codec = w->codec; - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - snd_soc_update_bits(codec, RT5640_GPIO_CTRL1, - RT5640_GP2_PIN_MASK | RT5640_GP4_PIN_MASK, - RT5640_GP2_PIN_DMIC1_SCL | RT5640_GP4_PIN_DMIC2_SDA); - snd_soc_update_bits(codec, RT5640_DMIC, - RT5640_DMIC_2L_LH_MASK | RT5640_DMIC_2R_LH_MASK | - RT5640_DMIC_2_DP_MASK, - RT5640_DMIC_2L_LH_FALLING | RT5640_DMIC_2R_LH_RISING | - RT5640_DMIC_2_DP_IN1N); - break; - - default: - return 0; - } - - return 0; -} - static void hp_amp_power_on(struct snd_soc_codec *codec) { struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); @@ -1054,12 +1006,10 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DMIC CLK", SND_SOC_NOPM, 0, 0, set_dmic_clk, SND_SOC_DAPM_PRE_PMU), - SND_SOC_DAPM_SUPPLY("DMIC1 Power", RT5640_DMIC, - RT5640_DMIC_1_EN_SFT, 0, rt5640_set_dmic1_event, - SND_SOC_DAPM_PRE_PMU), - SND_SOC_DAPM_SUPPLY("DMIC2 Power", RT5640_DMIC, - RT5640_DMIC_2_EN_SFT, 0, rt5640_set_dmic2_event, - SND_SOC_DAPM_PRE_PMU), + SND_SOC_DAPM_SUPPLY("DMIC1 Power", RT5640_DMIC, RT5640_DMIC_1_EN_SFT, 0, + NULL, 0), + SND_SOC_DAPM_SUPPLY("DMIC2 Power", RT5640_DMIC, RT5640_DMIC_2_EN_SFT, 0, + NULL, 0), /* Boost */ SND_SOC_DAPM_PGA("BST1", RT5640_PWR_ANLG2, RT5640_PWR_BST1_BIT, 0, NULL, 0), @@ -2179,6 +2129,25 @@ static int rt5640_i2c_probe(struct i2c_client *i2c, regmap_update_bits(rt5640->regmap, RT5640_IN3_IN4, RT5640_IN_DF2, RT5640_IN_DF2); + if (rt5640->pdata.dmic_en) { + regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1, + RT5640_GP2_PIN_MASK, RT5640_GP2_PIN_DMIC1_SCL); + + if (rt5640->pdata.dmic1_data_pin) { + regmap_update_bits(rt5640->regmap, RT5640_DMIC, + RT5640_DMIC_1_DP_MASK, RT5640_DMIC_1_DP_GPIO3); + regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1, + RT5640_GP3_PIN_MASK, RT5640_GP3_PIN_DMIC1_SDA); + } + + if (rt5640->pdata.dmic2_data_pin) { + regmap_update_bits(rt5640->regmap, RT5640_DMIC, + RT5640_DMIC_2_DP_MASK, RT5640_DMIC_2_DP_GPIO4); + regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1, + RT5640_GP4_PIN_MASK, RT5640_GP4_PIN_DMIC2_SDA); + } + } + rt5640->hp_mute = 1; ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640, -- 1.8.1.1.439.g50a6b54

3 7

[alsa-devel] [GIT PULL] ASoC updates for v3.15
by Mark Brown 31 Mar '14

31 Mar '14

The following changes since commit e090d5b6ad20056ec0ef58727e3ae95fd82be090: Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc-next (2014-03-23 14:00:59 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.15-4 for you to fetch changes up to c159a85013afbb8283f0c7272812952e04d5c3a1: Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next (2014-03-25 21:22:15 +0000) ---------------------------------------------------------------- ASoC: Final updates for v3.15 merge window A few more updates from last week - use of the tdm_slot mapping from Xiubo plus a few smaller fixes and cleanups. ---------------------------------------------------------------- Alex Smith (1): MIPS: Fix possible build error with transparent hugepages enabled Andreas Herrmann (1): MIPS: Octeon: Fix warning in of_device_alloc on cn3xxx Arnaldo Carvalho de Melo (1): perf bench numa: Make no args mean 'run all tests' Ben Pfaff (1): openvswitch: Correctly report flow used times for first 5 minutes after boot. Ben Widawsky (1): drm/i915: Fix PSR programming Benedikt Spranger (1): net: cpsw: do not register cpts twice Bjorn Helgaas (1): Revert "[PATCH] Insert GART region into resource map" Bjørn Mork (1): net: cdc_ncm: fix control message ordering Boris BREZILLON (1): ARM: at91: fix network interface ordering for sama5d36 Charles Keepax (1): ALSA: compress: Pass through return value of open ops callback Chris Wilson (1): drm/i915: Disable stolen memory when DMAR is active Christian Riesch (2): net: davinci_emac: Replace devm_request_irq with request_irq net: davinci_emac: Fix rollback of emac_dev_open() Clemens Ladisch (1): ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression Colin Ian King (1): MIPS: Octeon: Fix fall through on bar type OCTEON_DMA_BAR_TYPE_SMALL Daniel Kurtz (1): drm/exynos: Fix (more) freeing issues in exynos_drm_drv.c Daniel Vetter (2): drm/i915: Don't enable display error interrupts from the start drm: Fix use-after-free in the shadow-attache exit code Dave Airlie (3): Merge tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge tag 'drm-intel-fixes-2014-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Dave Jones (2): brcmfmac: fix skb leak in brcmf_sdio_txpkt_prep_sg error path. block: free q->flush_rq in blk_init_allocated_queue error paths Dave Kleikamp (1): sparc64: don't treat 64-bit syscall return codes as 32-bit David Miller (1): sparc: serial: Clean up the locking for -rt David S. Miller (6): Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge branch 'cnic-net' Merge branch 'fixes' of git://git.kernel.org/.../jesse/openvswitch sparc64: Make sure %pil interrupts are enabled during hypervisor yield. Merge branch 'davinci_emac' David Stevens (2): vxlan: fix potential NULL dereference in arp_reduce() vxlan: fix nonfunctional neigh_reduce() Deng-Cheng Zhu (4): MIPS: APRP: Fix the linking of rtlx interrupt hook MIPS: APRP: Unregister rtlx interrupt hook at module exit MIPS: APRP: Choose the correct VPE loader by fixing the linking MIPS: math-emu: Fix prefx detection and COP1X function field definition Doug Wilson (1): sparc64:tsb.c:use array size macro rather than number Eric Dumazet (1): tcp: syncookies: do not use getnstimeofday() Erik Hugne (1): tipc: fix spinlock recursion bug for failed subscriptions Felix Fietkau (1): ath9k_hw: fix unreachable code in baseband hang detection code Fernando Luis Vázquez Cao (1): HID: hidraw: fix warning destroying hidraw device files after parent Frank Praznik (1): HID: sony: Fix work queue issues. Helge Deller (2): partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts parisc: wire up sys_utimes Helmut Schaa (1): ath9k: Fix sequence number assignment for non-data frames Huacai Chen (1): MIPS: FPU: Fix conflict of register usage Hugh Dickins (2): mm: fix bad rss-counter if remap_file_pages raced migration mm: fix swapops.h:131 bug if remap_file_pages raced migration Ingo Molnar (1): Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/.../acme/linux into perf/urgent Jani Nikula (1): Revert "drm/i915: don't touch the VDD when disabling the panel" Jarno Rajahalme (2): openvswitch: Read tcp flags only then the tranport header is present. openvswitch: Fix race. Jean-Francois Moine (3): ASoC: simple-card: dynamically allocate the DAI link and properties ASoC: simple-card: Add DT documentation for multi-DAI links ASoC: simple-card: Handle many DAI links Jens Axboe (1): mtip32xx: fix bad use of smp_processor_id() Jim Quinlan (1): MIPS: Make local_irq_disable macro safe for non-Mipsr2 Jiri Pirko (1): ovs: fix dp check in ovs_dp_reset_user_features Joe Perches (1): MAINTAINERS: Add linux.nics(a)intel.com to INTEL ETHERNET DRIVERS John David Anglin (1): parisc: Remove unused CONFIG_PARISC_TMPALIAS code John W. Linville (1): Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Kuninori Morimoto (3): ARM: bockw: fixup SND_SOC_DAIFMT_CBx_CFx flags ASoC: rcar: bugfix: it cares about the non-src case ASoC: rcar: subnode tidyup for renesas,rsnd.txt Lars Persson (1): MIPS: Fix syscall tracing interface Lars-Peter Clausen (1): ASoC: Remove name_prefix unset during DAI link init hack Li RongQing (1): netpoll: fix the skb check in pkt_is_ns Li Zefan (1): cgroup: fix a failure path in create_css() Linus Torvalds (18): Merge branch 'for-linus' of git://git.kernel.org/.../jikos/hid Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Merge branch 'for-linus' of git://git.kernel.dk/linux-block Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'for-3.14-fixes' of git://git.kernel.org/.../tj/cgroup Merge tag 'pci-v3.14-fixes-3' of git://git.kernel.org/.../helgaas/pci Merge tag 'sound-3.14' of git://git.kernel.org/.../tiwai/sound Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Merge tag 'trace-fixes-v3.14-rc7' of git://git.kernel.org/.../rostedt/linux-trace futex: revert back to the explicit waiter counting code Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge git://git.kernel.org/.../davem/net Merge git://git.kernel.org/.../davem/sparc Merge branch 'parisc-3.14' of git://git.kernel.org/.../deller/parisc-linux Linux 3.14-rc8 Lucas Stach (1): ASoC: tegra: move AC97 clock handling to the machine driver Manuel Lauss (1): MIPS: Alchemy: Fix unchecked kstrtoul return value Mark Brown (14): Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52', 'asoc/fix/cs42l73', 'asoc/fix/rcar', 'asoc/fix/spear' and 'asoc/fix/tegra' into asoc-linus Merge tag 'asoc-v3.15' into asoc-next Merge tag 'asoc-v3.15-2' into asoc-next Merge tag 'asoc-v3.15-3' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52', 'asoc/fix/cs42l73', 'asoc/fix/rcar', 'asoc/fix/spear' and 'asoc/fix/tegra' into asoc-linus Merge tag 'asoc-v3.15' into asoc-next Merge tag 'asoc-v3.15-2' into asoc-next Merge tag 'asoc-v3.15-3' into asoc-next Merge tag 'asoc-v3.15-rcar' into asoc-next Merge remote-tracking branches 'asoc/topic/prefix' and 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/simple' into asoc-next Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next Markos Chandras (2): MIPS: bcm47xx: Include missing errno.h for ENXIO MIPS: asm: syscall: Fix copying system call arguments Michael Chan (3): cnic: Use proper ulp_ops for per device operations. cnic,bnx2i,bnx2fc: Fix inconsistent use of page size cnic: Update version to 2.5.20 and copyright year. Mike Snitzer (2): block: fix q->flush_rq NULL pointer crash on dm-mpath flush block: change flush sequence list addition back to front add Nicolas Dichtel (3): rtnetlink: fix fdb notification flags ipmr: fix mfc notification flags ip6mr: fix mfc notification flags Nikolay Aleksandrov (2): net: af_key: fix sleeping under rcu selinux: add gfp argument to security_xfrm_policy_alloc and fix callers Nishanth Menon (1): net: micrel : ks8851-ml: add vdd-supply support Patrick Palka (1): perf bench: Fix NULL pointer dereference in "perf bench all" Paul Bolle (2): MIPS: Replace CONFIG_MIPS64 and CONFIG_MIPS32_R2 isdn/capi: Make Middleware depend on CAPI2.0 Paul Burton (1): MIPS: mark O32+FP64 experimental for now Paul Mackerras (2): KVM: PPC: Book3S HV: Remove bogus duplicate code KVM: PPC: Book3S HV: Fix register usage when loading/saving VRSAVE Peter Senna Tschudin (2): ATHEROS-ALX: Use dma_set_mask_and_coherent and fix a bug ATHEROS-ATL1E: Convert iounmap to pci_iounmap Rafał Miłecki (1): MIPS: BCM47XX: Check all (32) GPIOs when looking for a pin Ralf Baechle (1): MIPS: Fix randconfig build error. Roger Luethi (1): via-rhine: Disable device in error path Sebastian Hesselbarth (1): net: phy: fix uninitalized ethtool_wolinfo in phy_suspend Shawn Guo (1): MAINTAINERS: update IMX kernel git tree Simon Wood (1): HID: hid-lg4ff: Support new version of G27 Stanislaw Gruszka (1): Revert "rt2x00: rt2800lib: Update BBP register initialization for RT53xx" Stefan Agner (1): clocksource: vf_pit_timer: use complement for sched_clock reading Vaibhav Nagarnaik (1): tracing: Fix array size mismatch in format string Ville Syrjälä (2): drm/i915: Add a workaround for HSW scanline counter weirdness drm/i915: Fix scanline counter fixup on BDW Viller Hsiao (2): MIPS: ftrace: Fix icache flush range error MIPS: ftrace: Tweak safe_load()/safe_store() macros Will Deacon (1): parisc: locks: remove redundant arch_*_relax operations Xiubo Li (4): ASoC: core: remove the 'of_' prefix of of_xlate_tdm_slot_mask. ASoC: fsl-utils: Add fsl_asoc_xlate_tdm_slot_mask() support. ASoC: fsl-esai: Add .xlate_tdm_slot_mask() support. ASoC: imx-ssi: Add .xlate_tdm_slot_mask() support. lucien (1): ipv6: ip6_append_data_mtu do not handle the mtu of the second fragment properly stephen hemminger (1): netlink: fix setsockopt in mmap examples in documentation .../devicetree/bindings/net/micrel-ks8851.txt | 1 + .../devicetree/bindings/sound/renesas,rsnd.txt | 15 +- .../devicetree/bindings/sound/simple-card.txt | 42 +++- Documentation/networking/netlink_mmap.txt | 4 +- MAINTAINERS | 5 +- Makefile | 2 +- arch/arm/boot/dts/sama5d36.dtsi | 2 +- arch/arm/mach-shmobile/board-bockw.c | 16 +- arch/mips/Kconfig | 24 ++- arch/mips/alchemy/board-gpr.c | 4 +- arch/mips/alchemy/board-mtx1.c | 4 +- arch/mips/bcm47xx/board.c | 1 + arch/mips/bcm47xx/nvram.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 22 ++- arch/mips/include/asm/asmmacro.h | 15 +- arch/mips/include/asm/fpu.h | 2 +- arch/mips/include/asm/ftrace.h | 20 +- arch/mips/include/asm/syscall.h | 10 +- arch/mips/include/uapi/asm/inst.h | 4 +- arch/mips/kernel/ftrace.c | 5 +- arch/mips/kernel/r4k_fpu.S | 16 +- arch/mips/kernel/rtlx-cmp.c | 3 + arch/mips/kernel/rtlx-mt.c | 3 + arch/mips/math-emu/cp1emu.c | 6 +- arch/mips/mti-malta/malta-amon.c | 2 +- arch/mips/mti-malta/malta-int.c | 4 +- arch/mips/pci/msi-octeon.c | 1 + arch/parisc/include/asm/page.h | 11 -- arch/parisc/include/asm/spinlock.h | 4 - arch/parisc/include/uapi/asm/unistd.h | 4 +- arch/parisc/kernel/cache.c | 64 ------ arch/parisc/kernel/syscall_table.S | 1 + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 71 +------ arch/sparc/kernel/process_64.c | 4 +- arch/sparc/kernel/syscalls.S | 4 +- arch/sparc/mm/tsb.c | 2 +- arch/x86/kernel/aperture_64.c | 20 +- block/blk-core.c | 25 ++- block/blk-flush.c | 11 +- drivers/block/mtip32xx/mtip32xx.c | 2 +- drivers/clocksource/vf_pit_timer.c | 2 +- drivers/gpu/drm/drm_pci.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 7 + drivers/gpu/drm/i915/i915_irq.c | 71 ++++--- drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 12 +- drivers/hid/hid-lg4ff.c | 2 + drivers/hid/hid-sony.c | 27 ++- drivers/hid/hidraw.c | 4 +- drivers/isdn/capi/Kconfig | 18 +- drivers/net/ethernet/atheros/alx/main.c | 14 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +- drivers/net/ethernet/broadcom/cnic.c | 111 +++++------ drivers/net/ethernet/broadcom/cnic.h | 2 +- drivers/net/ethernet/broadcom/cnic_defs.h | 2 +- drivers/net/ethernet/broadcom/cnic_if.h | 16 +- drivers/net/ethernet/micrel/ks8851.c | 30 ++- drivers/net/ethernet/ti/cpsw.c | 4 - drivers/net/ethernet/ti/davinci_cpdma.c | 4 +- drivers/net/ethernet/ti/davinci_emac.c | 53 +++-- drivers/net/ethernet/via/via-rhine.c | 8 +- drivers/net/phy/phy_device.c | 3 +- drivers/net/usb/cdc_ncm.c | 48 +++-- drivers/net/vxlan.c | 130 ++++++++++-- drivers/net/wireless/ath/ath9k/hw.c | 3 +- drivers/net/wireless/ath/ath9k/xmit.c | 4 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 6 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 16 +- drivers/scsi/bnx2fc/bnx2fc_tgt.c | 38 ++-- drivers/scsi/bnx2i/bnx2i_hwi.c | 52 ++--- drivers/scsi/bnx2i/bnx2i_iscsi.c | 23 +-- drivers/tty/serial/sunhv.c | 22 +-- drivers/tty/serial/sunsab.c | 14 +- drivers/tty/serial/sunsu.c | 14 +- drivers/tty/serial/sunzilog.c | 14 +- include/linux/ftrace_event.h | 4 - include/linux/rmap.h | 3 +- include/linux/security.h | 10 +- include/linux/usb/cdc_ncm.h | 1 + include/net/tcp.h | 11 +- include/sound/soc-dai.h | 2 +- include/trace/ftrace.h | 7 +- kernel/cgroup.c | 11 +- kernel/futex.c | 53 ++++- kernel/trace/trace_events.c | 6 - kernel/trace/trace_export.c | 7 +- lib/fonts/Kconfig | 6 +- mm/fremap.c | 28 ++- mm/migrate.c | 32 +++ mm/rmap.c | 5 +- net/core/netpoll.c | 2 +- net/core/rtnetlink.c | 10 +- net/ipv4/ipmr.c | 13 +- net/ipv6/ip6_output.c | 14 +- net/ipv6/ip6mr.c | 13 +- net/key/af_key.c | 19 +- net/openvswitch/datapath.c | 9 +- net/openvswitch/flow.c | 3 +- net/tipc/subscr.c | 29 +-- net/xfrm/xfrm_user.c | 6 +- security/capability.c | 3 +- security/security.c | 6 +- security/selinux/hooks.c | 13 +- security/selinux/include/security.h | 2 +- security/selinux/include/xfrm.h | 3 +- security/selinux/selinuxfs.c | 28 ++- security/selinux/ss/services.c | 6 +- security/selinux/xfrm.c | 14 +- sound/core/compress_offload.c | 2 +- sound/pci/oxygen/xonar_dg.c | 30 ++- sound/soc/fsl/Kconfig | 2 + sound/soc/fsl/fsl_esai.c | 2 + sound/soc/fsl/fsl_utils.c | 27 +++ sound/soc/fsl/fsl_utils.h | 4 +- sound/soc/fsl/imx-ssi.c | 2 + sound/soc/generic/simple-card.c | 220 +++++++++++++-------- sound/soc/sh/rcar/src.c | 18 +- sound/soc/soc-core.c | 17 +- sound/soc/tegra/tegra20_ac97.c | 15 +- sound/soc/tegra/tegra20_ac97.h | 1 - sound/soc/tegra/tegra_wm9712.c | 17 +- tools/perf/bench/numa.c | 1 + tools/perf/builtin-bench.c | 2 +- 125 files changed, 1152 insertions(+), 840 deletions(-)

2 1

[alsa-devel] [PATCH 1/2] snd-ice1712: add suspend support for ICE1712 chip
by Ondrej Zary 31 Mar '14

31 Mar '14

Add suspend/resume support for ICE1712 chip. Card-specific subdrivers need to enable it and provide callbacks that suspend/resume the codecs. Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> --- sound/pci/ice1712/ice1712.c | 85 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 8 deletions(-) diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 28ec872..dbb0f96 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2428,6 +2428,13 @@ static int snd_ice1712_chip_init(struct snd_ice1712 *ice) snd_ice1712_write(ice, ICE1712_IREG_CONSUMER_POWERDOWN, 0); } snd_ice1712_set_pro_rate(ice, 48000, 1); + /* unmask used interrupts */ + outb(((ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_2xMPU401) == 0 ? + ICE1712_IRQ_MPU2 : 0) | + ((ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_NO_CON_AC97) ? + ICE1712_IRQ_PBKDS | ICE1712_IRQ_CONCAP | ICE1712_IRQ_CONPBK : 0), + ICEREG(ice, IRQMASK)); + outb(0x00, ICEMT(ice, IRQ)); return 0; } @@ -2589,6 +2596,7 @@ static int snd_ice1712_create(struct snd_card *card, ice->pci = pci; ice->irq = -1; pci_set_master(pci); + /* disable legacy emulation */ pci_write_config_word(ice->pci, 0x40, 0x807f); pci_write_config_word(ice->pci, 0x42, 0x0006); snd_ice1712_proc_init(ice); @@ -2625,14 +2633,6 @@ static int snd_ice1712_create(struct snd_card *card, return -EIO; } - /* unmask used interrupts */ - outb(((ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_2xMPU401) == 0 ? - ICE1712_IRQ_MPU2 : 0) | - ((ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_NO_CON_AC97) ? - ICE1712_IRQ_PBKDS | ICE1712_IRQ_CONCAP | ICE1712_IRQ_CONPBK : 0), - ICEREG(ice, IRQMASK)); - outb(0x00, ICEMT(ice, IRQ)); - err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ice, &ops); if (err < 0) { snd_ice1712_free(ice); @@ -2809,11 +2809,80 @@ static void snd_ice1712_remove(struct pci_dev *pci) snd_card_free(card); } +#ifdef CONFIG_PM_SLEEP +static int snd_ice1712_suspend(struct device *dev) +{ + struct pci_dev *pci = to_pci_dev(dev); + struct snd_card *card = dev_get_drvdata(dev); + struct snd_ice1712 *ice = card->private_data; + + if (!ice->pm_suspend_enabled) + return 0; + + snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); + + snd_pcm_suspend_all(ice->pcm); + snd_pcm_suspend_all(ice->pcm_pro); + snd_pcm_suspend_all(ice->pcm_ds); + snd_ac97_suspend(ice->ac97); + + if (ice->pm_suspend) + ice->pm_suspend(ice); + + pci_disable_device(pci); + pci_save_state(pci); + pci_set_power_state(pci, PCI_D3hot); + return 0; +} + +static int snd_ice1712_resume(struct device *dev) +{ + struct pci_dev *pci = to_pci_dev(dev); + struct snd_card *card = dev_get_drvdata(dev); + struct snd_ice1712 *ice = card->private_data; + + if (!ice->pm_suspend_enabled) + return 0; + + pci_set_power_state(pci, PCI_D0); + pci_restore_state(pci); + + if (pci_enable_device(pci) < 0) { + snd_card_disconnect(card); + return -EIO; + } + + pci_set_master(pci); + + if (snd_ice1712_chip_init(ice) < 0) { + snd_card_disconnect(card); + return -EIO; + } + + if (ice->pm_resume) + ice->pm_resume(ice); + + if (ice->ac97) + snd_ac97_resume(ice->ac97); + + snd_power_change_state(card, SNDRV_CTL_POWER_D0); + return 0; +} + +static SIMPLE_DEV_PM_OPS(snd_ice1712_pm, snd_ice1712_suspend, snd_ice1712_resume); +#define SND_VT1712_PM_OPS &snd_ice1712_pm +#else +#define SND_VT1712_PM_OPS NULL +#endif /* CONFIG_PM_SLEEP */ + static struct pci_driver ice1712_driver = { .name = KBUILD_MODNAME, .id_table = snd_ice1712_ids, .probe = snd_ice1712_probe, .remove = snd_ice1712_remove, + .driver = { + .pm = SND_VT1712_PM_OPS, + }, }; module_pci_driver(ice1712_driver); -- Ondrej Zary

2 2

[alsa-devel] [PATCH] ASoC: rsnd: fix src clock prepare/unprepare
by Ben Dooks 31 Mar '14

31 Mar '14

As with the previous commit, before a clock can be used it must be prepared for use. Change from clk_enable() and clk_disable() to the versions of the calls which also prepare and un-prepare the clocks. Will fix warnings from the clock code when this is used. Signed-off-by: Ben Dooks <ben.dooks(a)codethink.co.uk> --- sound/soc/sh/rcar/scu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c index 9153a11..3b1d1d2 100644 --- a/sound/soc/sh/rcar/scu.c +++ b/sound/soc/sh/rcar/scu.c @@ -284,7 +284,7 @@ static int rsnd_scu_start(struct rsnd_mod *mod, return 0; } - clk_enable(scu->clk); + clk_prepare_enable(scu->clk); /* it use DMA transter */ @@ -317,7 +317,7 @@ static int rsnd_scu_stop(struct rsnd_mod *mod, rsnd_scu_transfer_stop(priv, mod, rdai, io); - clk_disable(scu->clk); + clk_disable_unprepare(scu->clk); return 0; } -- 1.9.0

2 6

Re: [alsa-devel] is 440 Hz the true harmonic wave
by Joël Krähemann 31 Mar '14

31 Mar '14

On Mon, 2014-03-31 at 10:27 +0200, Felix Homann wrote: > 2014-03-31 10:20 GMT+02:00 Joël Krähemann <joel(a)weedlight.ch>: > > > I believe that 440 Hz is an approximation rather than true > harmonic on > it's pressure. Or am I wrong? Sine is harmonic in default arc. > > > > What are you talking about??? About scale. Am I wrong when I believe 440 Hz has physical property to be harmonic?

1 2

[alsa-devel] [PATCH] ALSA: hda - Enable beep for ASUS 1015E
by W. Trevor King 31 Mar '14

31 Mar '14

The `lspci -nnvv` output contains (wrapped for line length): 00:1b.0 Audio device [0403]: Intel Corporation 7 Series/C210 Series Chipset Family High Definition Audio Controller [8086:1e20] (rev 04) Subsystem: ASUSTeK Computer Inc. Device [1043:115d] Signed-off-by: W. Trevor King <wking(a)tremily.us> --- This patch is against git://git.alsa-project.org/alsa-kernel.git master (currently e38d6d3, ALSA: hda - Add Dell headset detection quirk for three laptop models, 2013-12-13), but I imagine it will apply cleanly to any recent branch. I'm happy to fill in any other information folks want, in case there's uncertainty about whether it's just a one-off quirk for my hardware instance, or if it's a general quirk for all 1043:115d devices. Cheers, Trevor sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3578f11..7cfe209 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1001,6 +1001,7 @@ static int alc_codec_rename_from_preset(struct hda_codec *codec) static const struct snd_pci_quirk beep_white_list[] = { SND_PCI_QUIRK(0x1043, 0x103c, "ASUS", 1), + SND_PCI_QUIRK(0x1043, 0x115d, "ASUS", 1), SND_PCI_QUIRK(0x1043, 0x829f, "ASUS", 1), SND_PCI_QUIRK(0x1043, 0x8376, "EeePC", 1), SND_PCI_QUIRK(0x1043, 0x83ce, "EeePC", 1), -- 1.9.1.353.gc66d89d

2 1

[alsa-devel] [patch] ALSA: asihpi: fix some indenting in snd_card_asihpi_pcm_new()
by Dan Carpenter 31 Mar '14

31 Mar '14

This used to be a part of a condition until f3d145aac913 ('ALSA: asihpi: MMAP for non-busmaster cards') but now it's not and we can remove an indent level. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index e4e42f2..901c949 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c @@ -1253,11 +1253,12 @@ static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device) num_outstreams, num_instreams, &pcm); if (err < 0) return err; + /* pointer to ops struct is stored, dont change ops afterwards! */ - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, - &snd_card_asihpi_playback_mmap_ops); - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, - &snd_card_asihpi_capture_mmap_ops); + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, + &snd_card_asihpi_playback_mmap_ops); + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, + &snd_card_asihpi_capture_mmap_ops); pcm->private_data = asihpi; pcm->info_flags = 0;

2 1

[alsa-devel] is 440 Hz the true harmonic wave
by Joël Krähemann 31 Mar '14

31 Mar '14

Is 440 Hz the true harmonic wave? Is there a constant for it in glibc, like M_PI?

2 2

[alsa-devel] RT priority 99 on soundcard
by Joël Krähemann 31 Mar '14

31 Mar '14

Is running on top of soundcard with realtime priority 99 problematic? /* and now async */ { static const struct timespec req = { 0, (250000000 * (1 / 45)), }; if(!AGS_IS_DEVOUT_THREAD(thread)){ nanosleep(&req, NULL); } }

2 1