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

[alsa-devel] [PATCH] ASoC: Intel: Add macros for SST shim register bits.
by Jie Yang 30 Jul '14

30 Jul '14

From: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Add some register definitions for other shim register bits. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/sst-dsp.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/sst-dsp.h index 21a85eb..3165dfa 100644 --- a/sound/soc/intel/sst-dsp.h +++ b/sound/soc/intel/sst-dsp.h @@ -77,6 +77,8 @@ #define SST_CSR_S0IOCS (0x1 << 21) #define SST_CSR_S1IOCS (0x1 << 23) #define SST_CSR_LPCS (0x1 << 31) +#define SST_CSR_24MHZ_LPCS (SST_CSR_SBCS0 | SST_CSR_SBCS1 | SST_CSR_LPCS) +#define SST_CSR_24MHZ_NO_LPCS (SST_CSR_SBCS0 | SST_CSR_SBCS1) #define SST_BYT_CSR_RST (0x1 << 0) #define SST_BYT_CSR_VECTOR_SEL (0x1 << 1) #define SST_BYT_CSR_STALL (0x1 << 2) @@ -96,6 +98,14 @@ #define SST_IMRX_DONE (0x1 << 0) #define SST_BYT_IMRX_REQUEST (0x1 << 1) +/* IMRD / IMD */ +#define SST_IMRD_DONE (0x1 << 0) +#define SST_IMRD_BUSY (0x1 << 1) +#define SST_IMRD_SSP0 (0x1 << 16) +#define SST_IMRD_DMAC0 (0x1 << 21) +#define SST_IMRD_DMAC1 (0x1 << 22) +#define SST_IMRD_DMAC (SST_IMRD_DMAC0 | SST_IMRD_DMAC1) + /* IPCX / IPCC */ #define SST_IPCX_DONE (0x1 << 30) #define SST_IPCX_BUSY (0x1 << 31) @@ -125,6 +135,18 @@ /* HMDC */ #define SST_HMDC_HDDA0(x) (x << 0) #define SST_HMDC_HDDA1(x) (x << 7) +#define SST_HMDC_HDDA_E0_CH0 1 +#define SST_HMDC_HDDA_E0_CH1 2 +#define SST_HMDC_HDDA_E0_CH2 4 +#define SST_HMDC_HDDA_E0_CH3 8 +#define SST_HMDC_HDDA_E1_CH0 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH0) +#define SST_HMDC_HDDA_E1_CH1 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH1) +#define SST_HMDC_HDDA_E1_CH2 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH2) +#define SST_HMDC_HDDA_E1_CH3 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH3) +#define SST_HMDC_HDDA_E0_ALLCH (SST_HMDC_HDDA_E0_CH0 | SST_HMDC_HDDA_E0_CH1 | \ + SST_HMDC_HDDA_E0_CH2 | SST_HMDC_HDDA_E0_CH3) +#define SST_HMDC_HDDA_E1_ALLCH (SST_HMDC_HDDA_E1_CH0 | SST_HMDC_HDDA_E1_CH1 | \ + SST_HMDC_HDDA_E1_CH2 | SST_HMDC_HDDA_E1_CH3) /* SST Vendor Defined Registers and bits */ @@ -134,11 +156,16 @@ #define SST_VDRTCTL3 0xaC /* VDRTCTL0 */ +#define SST_VDRTCL0_APLLSE_MASK 1 #define SST_VDRTCL0_DSRAMPGE_SHIFT 16 #define SST_VDRTCL0_DSRAMPGE_MASK (0xffff << SST_VDRTCL0_DSRAMPGE_SHIFT) #define SST_VDRTCL0_ISRAMPGE_SHIFT 6 #define SST_VDRTCL0_ISRAMPGE_MASK (0x3ff << SST_VDRTCL0_ISRAMPGE_SHIFT) +/* PMCS */ +#define SST_PMCS 0x84 +#define SST_PMCS_PS_MASK 0x3 + struct sst_dsp; /* -- 1.8.3.2

2 1

[alsa-devel] [PATCH] ASoC: Intel: Fix naming of HMDC register macros.
by Jie Yang 30 Jul '14

30 Jul '14

From: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> HMDC is the correct naming for this register. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/sst-dsp.h | 8 ++++---- sound/soc/intel/sst-haswell-dsp.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/sst-dsp.h index 967fb32..21a85eb 100644 --- a/sound/soc/intel/sst-dsp.h +++ b/sound/soc/intel/sst-dsp.h @@ -52,7 +52,7 @@ #define SST_CLKCTL 0x78 #define SST_CSR2 0x80 #define SST_LTRC 0xE0 -#define SST_HDMC 0xE8 +#define SST_HMDC 0xE8 #define SST_SHIM_BEGIN SST_CSR #define SST_SHIM_END SST_HDMC @@ -122,9 +122,9 @@ /* LTRC */ #define SST_LTRC_VAL(x) (x << 0) -/* HDMC */ -#define SST_HDMC_HDDA0(x) (x << 0) -#define SST_HDMC_HDDA1(x) (x << 7) +/* HMDC */ +#define SST_HMDC_HDDA0(x) (x << 0) +#define SST_HMDC_HDDA1(x) (x << 7) /* SST Vendor Defined Registers and bits */ diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c index 03ea282..4b6c163 100644 --- a/sound/soc/intel/sst-haswell-dsp.c +++ b/sound/soc/intel/sst-haswell-dsp.c @@ -269,9 +269,9 @@ static void hsw_boot(struct sst_dsp *sst) SST_CSR2_SDFD_SSP1); /* enable DMA engine 0,1 all channels to access host memory */ - sst_dsp_shim_update_bits_unlocked(sst, SST_HDMC, - SST_HDMC_HDDA1(0xff) | SST_HDMC_HDDA0(0xff), - SST_HDMC_HDDA1(0xff) | SST_HDMC_HDDA0(0xff)); + sst_dsp_shim_update_bits_unlocked(sst, SST_HMDC, + SST_HMDC_HDDA1(0xff) | SST_HMDC_HDDA0(0xff), + SST_HMDC_HDDA1(0xff) | SST_HMDC_HDDA0(0xff)); /* disable all clock gating */ writel(0x0, sst->addr.pci_cfg + SST_VDRTCTL2); -- 1.8.3.2

2 1

[alsa-devel] [PATCH v2 00/12] Remove mach-kirkwood
by Andrew Lunn 30 Jul '14

30 Jul '14

This patchset removes arch/arm/mach-kirkwood. This SoCs is now supported in arch/arm/mach-mvebu using device tree. V1 of this patchset also removed mach-dove. However it has been decided to leave it alone for a while to aid some developers get out of tree patches merged. Change the dependencies for a number of drivers, either to use ARCH_MVEBU where the drivers are generic, or MACH_KIRKWOOD and where the drivers are specific to the SoC. Once Jason Cooper has Acked these patches, we would prefer that individual subsystem maintainers take these patches through their own trees. Thanks Andrew Andrew Lunn (12): ARM: Kirkwood: Remove mach-kirkwood ARM: Kirkwood: Remove kirkwood_defconfig ASoC: kirkwood: Remove unused drivers ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency ata: Remove ARCH_KIRKWOOD dependency thermal: Remove ARCH_KIRKWOOD dependency leds: Remove ARCH_KIRKWOOD dependency PCI: Remove ARCH_KIRKWOOD dependency phy: Remove ARCH_KIRKWOOD dependency rtc: Remove ARCH_KIRKWOOD dependency watchdog: Remove ARCH_KIRKWOOD dependency arch/arm/Kconfig | 18 - arch/arm/Kconfig.debug | 6 +- arch/arm/Makefile | 1 - arch/arm/boot/dts/Makefile | 5 +- arch/arm/configs/kirkwood_defconfig | 181 ------ arch/arm/mach-kirkwood/Kconfig | 111 ---- arch/arm/mach-kirkwood/Makefile | 14 - arch/arm/mach-kirkwood/Makefile.boot | 3 - arch/arm/mach-kirkwood/board-dt.c | 223 ------- arch/arm/mach-kirkwood/common.c | 746 ---------------------- arch/arm/mach-kirkwood/common.h | 74 --- arch/arm/mach-kirkwood/d2net_v2-setup.c | 231 ------- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 86 --- arch/arm/mach-kirkwood/include/mach/entry-macro.S | 34 - arch/arm/mach-kirkwood/include/mach/hardware.h | 14 - arch/arm/mach-kirkwood/include/mach/irqs.h | 65 -- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 142 ---- arch/arm/mach-kirkwood/include/mach/uncompress.h | 46 -- arch/arm/mach-kirkwood/irq.c | 82 --- arch/arm/mach-kirkwood/lacie_v2-common.c | 114 ---- arch/arm/mach-kirkwood/lacie_v2-common.h | 16 - arch/arm/mach-kirkwood/mpp.c | 43 -- arch/arm/mach-kirkwood/mpp.h | 348 ---------- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 422 ------------ arch/arm/mach-kirkwood/openrd-setup.c | 255 -------- arch/arm/mach-kirkwood/pcie.c | 296 --------- arch/arm/mach-kirkwood/pm.c | 76 --- arch/arm/mach-kirkwood/pm.h | 26 - arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 89 --- arch/arm/mach-kirkwood/rd88f6281-setup.c | 128 ---- arch/arm/mach-kirkwood/t5325-setup.c | 216 ------- arch/arm/mach-kirkwood/ts219-setup.c | 142 ---- arch/arm/mach-kirkwood/ts41x-setup.c | 186 ------ arch/arm/mach-kirkwood/tsx1x-common.c | 113 ---- arch/arm/mach-kirkwood/tsx1x-common.h | 7 - arch/arm/mm/Kconfig | 2 +- drivers/ata/Kconfig | 2 +- drivers/cpuidle/Kconfig.arm | 2 +- drivers/leds/Kconfig | 4 +- drivers/pci/host/Kconfig | 2 +- drivers/phy/Kconfig | 2 +- drivers/rtc/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 19 +- sound/soc/kirkwood/Makefile | 4 - sound/soc/kirkwood/kirkwood-openrd.c | 109 ---- sound/soc/kirkwood/kirkwood-t5325.c | 116 ---- 48 files changed, 14 insertions(+), 4813 deletions(-) delete mode 100644 arch/arm/configs/kirkwood_defconfig delete mode 100644 arch/arm/mach-kirkwood/Kconfig delete mode 100644 arch/arm/mach-kirkwood/Makefile delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot delete mode 100644 arch/arm/mach-kirkwood/board-dt.c delete mode 100644 arch/arm/mach-kirkwood/common.c delete mode 100644 arch/arm/mach-kirkwood/common.h delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h delete mode 100644 arch/arm/mach-kirkwood/irq.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h delete mode 100644 arch/arm/mach-kirkwood/mpp.c delete mode 100644 arch/arm/mach-kirkwood/mpp.h delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c delete mode 100644 arch/arm/mach-kirkwood/pcie.c delete mode 100644 arch/arm/mach-kirkwood/pm.c delete mode 100644 arch/arm/mach-kirkwood/pm.h delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c -- 2.0.1 Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Cc: Daniel Lezcano <daniel.lezcano(a)linaro.org> Cc: Rafael J. Wysocki <rjw(a)rjwysocki.net> Cc: linux-pm(a)vger.kernel.org Cc: Tejun Heo <tj(a)kernel.org> Cc: linux-ide(a)vger.kernel.org Cc: Zhang Rui <rui.zhang(a)intel.com> Cc: Bryan Wu <cooloney(a)gmail.com> Cc: Richard Purdie <rpurdie(a)rpsys.net> Cc: linux-leds(a)vger.kernel.org Cc: Bjorn Helgaas <bhelgaas(a)google.com> Cc: linux-pci(a)vger.kernel.org Cc: Kishon Vijay Abraham I <kishon(a)ti.com> Cc: Alessandro Zummo <a.zummo(a)towertech.it> Cc: rtc-linux(a)googlegroups.com Cc: Wim Van Sebroeck <wim(a)iguana.be> Cc: linux-watchdog(a)vger.kernel.org

4 8

[alsa-devel] If underloading is possible what about overloading?
by Joël Krähemann 30 Jul '14

30 Jul '14

Hi all, short question: If underloading is possible what about overloading? Is nanosleep overclocking safe? regards Joël

1 0

[alsa-devel] hda_analyzer vs alc668 asus NJ750k
by Patrick Shirkey 30 Jul '14

30 Jul '14

Hi, I get some errors running hda_analyzer with this alc668 chipset. Traceback (most recent call last): File "/dev/shm/hda-analyzer/hda_analyzer.py", line 546, in <module> sys.exit(main(sys.argv)) File "/dev/shm/hda-analyzer/hda_analyzer.py", line 523, in main if read_nodes(sys.argv[1:]) == 0: File "/dev/shm/hda-analyzer/hda_analyzer.py", line 89, in read_nodes read_nodes2(c.card, i) File "/dev/shm/hda-analyzer/hda_analyzer.py", line 60, in read_nodes2 c = HDACodec(card, codec) File "/dev/shm/hda-analyzer/hda_codec.py", line 1041, in __init__ self.parse_proc() File "/dev/shm/hda-analyzer/hda_codec.py", line 1140, in parse_proc self.proc_codec = HDACodecProc(self.card, self.device, file) File "/dev/shm/hda-analyzer/hda_proc.py", line 479, in __init__ self.parse(proc_file) File "/dev/shm/hda-analyzer/hda_proc.py", line 677, in parse node.add_digital(line[11:]) File "/dev/shm/hda-analyzer/hda_proc.py", line 296, in add_digital self.wrongfile('unknown dig1 bit %s' % repr(b)) File "/dev/shm/hda-analyzer/hda_proc.py", line 143, in wrongfile raise ValueError, "wrong proc file format (%s)" % msg ValueError: wrong proc file format (unknown dig1 bit 'KAE') If I disable the check for add_digital I get this error: ValueError: wrong proc file format ( Digital: Enabled KAE) - Is it a problem to add a new DIG1_BIT to hda_proc.py:277 def add_digital(self, line): bits = { 'Enabled': DIG1_BITS['ENABLE'], 'Validity': DIG1_BITS['VALIDITY'], 'ValidityCfg': DIG1_BITS['VALIDITYCFG'], 'Preemphasis': DIG1_BITS['EMPHASIS'], 'Copyright': DIG1_BITS['COPYRIGHT'], # old buggy format 'Non-Copyright': DIG1_BITS['COPYRIGHT'], 'Non-Audio': DIG1_BITS['NONAUDIO'], 'Pro': DIG1_BITS['PROFESSIONAL'], 'GenLevel': DIG1_BITS['LEVEL'], 'KAE': DIG1_BITS['KAE'], } hda_codec.py:224 DIG1_BITS = { 'ENABLE': 0, 'VALIDITY': 1, 'VALIDITYCFG': 2, 'EMPHASIS': 3, 'COPYRIGHT': 4, 'NONAUDIO': 5, 'PROFESSIONAL': 6, 'LEVEL': 7, 'KAE': 8 } - If I do that I get this error: Traceback (most recent call last): File "hda_analyzer.py", line 546, in <module> sys.exit(main(sys.argv)) File "hda_analyzer.py", line 523, in main if read_nodes(sys.argv[1:]) == 0: File "hda_analyzer.py", line 89, in read_nodes read_nodes2(c.card, i) File "hda_analyzer.py", line 60, in read_nodes2 c = HDACodec(card, codec) File "/home/patrick/code/alsa-utilities/hda-analyzer/hda_codec.py", line 1043, in __init__ self.parse_proc() File "/home/patrick/code/alsa-utilities/hda-analyzer/hda_codec.py", line 1142, in parse_proc self.proc_codec = HDACodecProc(self.card, self.device, file) File "/home/patrick/code/alsa-utilities/hda-analyzer/hda_proc.py", line 480, in __init__ self.parse(proc_file) File "/home/patrick/code/alsa-utilities/hda-analyzer/hda_proc.py", line 732, in parse self.wrongfile(line) File "/home/patrick/code/alsa-utilities/hda-analyzer/hda_proc.py", line 143, in wrongfile raise ValueError, "wrong proc file format (%s)" % msg ValueError: wrong proc file format ( Devices: 0) - If I replace the call in hda_proc.py:734 to self.wrongfile() with a print command ex. else: print ('strange line : %s' % line) # self.wrongfile(line) I get this output and hda_analyzer interface starts: # python hda_analyzer.py strange line : Devices: 0 strange line : In-driver Connection: 3 strange line : 0x02 0x03 0x04 strange line : Devices: 0 strange line : In-driver Connection: 3 strange line : 0x02 0x03 0x04 strange line : Devices: 0 strange line : In-driver Connection: 3 strange line : 0x02 0x03 0x04 - If I run "alsa-jack-sense-test -a" I get this output: # python alsa-jack-sense-test.py -a strange line : Devices: 0 strange line : In-driver Connection: 3 strange line : 0x02 0x03 0x04 strange line : Devices: 0 strange line : In-driver Connection: 3 strange line : 0x02 0x03 0x04 strange line : Devices: 0 strange line : In-driver Connection: 3 strange line : 0x02 0x03 0x04 Pin 0x05 (Unknown Digital Out): present = No Pin 0x06 (Unknown Digital Out): present = No Pin 0x07 (Unknown Digital Out): present = No -- Patrick Shirkey Boost Hardware Ltd

3 3

[alsa-devel] [PATCH] ALSA: hda - fix an external mic jack problem on a HP machine
by Hui Wang 30 Jul '14

30 Jul '14

ON the machine, two pin complex (0xb and 0xe) are both routed to the same external right-side mic jack, this makes the jack can't work. To fix this problem, set the 0xe to "not connected". BugLink: https://bugs.launchpad.net/bugs/1350148 Tested-by: Franz Hsieh <franz.hsieh(a)canonical.com> Cc: stable(a)vger.kernel.org Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_sigmatel.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 8dc6815..ea823e1 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -84,6 +84,7 @@ enum { STAC_DELL_EQ, STAC_ALIENWARE_M17X, STAC_92HD89XX_HP_FRONT_JACK, + STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK, STAC_92HD73XX_MODELS }; @@ -1810,6 +1811,11 @@ static const struct hda_pintbl stac92hd89xx_hp_front_jack_pin_configs[] = { {} }; +static const struct hda_pintbl stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs[] = { + { 0x0e, 0x400000f0 }, + {} +}; + static void stac92hd73xx_fixup_ref(struct hda_codec *codec, const struct hda_fixup *fix, int action) { @@ -1932,6 +1938,10 @@ static const struct hda_fixup stac92hd73xx_fixups[] = { [STAC_92HD89XX_HP_FRONT_JACK] = { .type = HDA_FIXUP_PINS, .v.pins = stac92hd89xx_hp_front_jack_pin_configs, + }, + [STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK] = { + .type = HDA_FIXUP_PINS, + .v.pins = stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs, } }; @@ -1992,6 +2002,8 @@ static const struct snd_pci_quirk stac92hd73xx_fixup_tbl[] = { "Alienware M17x", STAC_ALIENWARE_M17X), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490, "Alienware M17x R3", STAC_DELL_EQ), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1927, + "HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK), SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17, "unknown HP", STAC_92HD89XX_HP_FRONT_JACK), {} /* terminator */ -- 1.9.1

2 1

Re: [alsa-devel] Fast track Ultra external clock control in ALSA
by Felix Homann 29 Jul '14

29 Jul '14

Am 29.07.2014 13:01 schrieb "Marcelo" <marcelovborro(a)gmail.com>: > > My question is: was it implemented? It has not been implemented, yet. @Daniel: Do you still remember how this would have to be done? I think I can find something in my usbmon sniffs from 2010 but I still don't have a second device I could test this with. Kind regards, Felix

1 0

[alsa-devel] [PATCH] ASoC: tlv320aic23: Convert to params_width()
by Mark Brown 29 Jul '14

29 Jul '14

From: Mark Brown <broonie(a)linaro.org> The CODEC doesn't care how data is laid out in memory. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/tlv320aic23.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 686b8b85b956..d67167920c2f 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -364,16 +364,16 @@ static int tlv320aic23_hw_params(struct snd_pcm_substream *substream, iface_reg = snd_soc_read(codec, TLV320AIC23_DIGT_FMT) & ~(0x03 << 2); - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: iface_reg |= (0x01 << 2); break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: iface_reg |= (0x02 << 2); break; - case SNDRV_PCM_FORMAT_S32_LE: + case 32: iface_reg |= (0x03 << 2); break; } -- 2.0.1

1 0

[alsa-devel] [PATCH] ASoC: fsl_asrc: Use 'ifdef' for config options
by Fabio Estevam 29 Jul '14

29 Jul '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> Fix the following build errors that were observed by building with make ARCH=microblaze allyesconfig: >> sound/soc/fsl/fsl_asrc.c:906:5: warning: "CONFIG_PM_RUNTIME" is not defined [-Wundef] #if CONFIG_PM_RUNTIME ^ >> sound/soc/fsl/fsl_asrc.c:934:5: warning: "CONFIG_PM_SLEEP" is not defined [-Wundef] #if CONFIG_PM_SLEEP ^ >> sound/soc/fsl/fsl_asrc.c:906:5: warning: "CONFIG_PM_RUNTIME" is not defined [-Wundef] #if CONFIG_PM_RUNTIME ^ >> sound/soc/fsl/fsl_asrc.c:934:5: warning: "CONFIG_PM_SLEEP" is not defined [-Wundef] #if CONFIG_PM_SLEEP Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/fsl_asrc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 27a4a70..b9a2888 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -903,7 +903,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) return 0; } -#if CONFIG_PM_RUNTIME +#ifdef CONFIG_PM_RUNTIME static int fsl_asrc_runtime_resume(struct device *dev) { struct fsl_asrc *asrc_priv = dev_get_drvdata(dev); @@ -931,7 +931,7 @@ static int fsl_asrc_runtime_suspend(struct device *dev) } #endif /* CONFIG_PM_RUNTIME */ -#if CONFIG_PM_SLEEP +#ifdef CONFIG_PM_SLEEP static int fsl_asrc_suspend(struct device *dev) { struct fsl_asrc *asrc_priv = dev_get_drvdata(dev); -- 1.8.3.2

2 1

[alsa-devel] [PATCH -next] ASoC: samsung: Fix return value check in s3c2412_iis_dev_probe()
by weiyj_lk＠163.com 29 Jul '14

29 Jul '14

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Also remove redundant return value check of platform_get_resource(). Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/samsung/s3c2412-i2s.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 9180310..27b339c 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -154,13 +154,9 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) struct resource *res; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "Can't get IO resource.\n"); - return -ENOENT; - } s3c2412_i2s.regs = devm_ioremap_resource(&pdev->dev, res); - if (s3c2412_i2s.regs == NULL) - return -ENXIO; + if (IS_ERR(s3c2412_i2s.regs)) + return PTR_ERR(s3c2412_i2s.regs); s3c2412_i2s_pcm_stereo_out.dma_addr = res->start + S3C2412_IISTXD; s3c2412_i2s_pcm_stereo_in.dma_addr = res->start + S3C2412_IISRXD;

2 1