May 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: aoa: convert bus code to use dev_groups
by Quentin Lambert 12 Jun '15

12 Jun '15

You should use dev_groups instead of the dev_attrs field of struct bus_type. This converts the MDIO bus code to use the correct field. These modifications were made using Coccinelle. Signed-off-by: Quentin Lambert <lambert.quentin(a)gmail.com> --- sound/aoa/soundbus/core.c | 3 ++- sound/aoa/soundbus/soundbus.h | 2 +- sound/aoa/soundbus/sysfs.c | 13 ++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) --- a/sound/aoa/soundbus/core.c +++ b/sound/aoa/soundbus/core.c @@ -150,6 +150,7 @@ static int soundbus_device_resume(struct #endif /* CONFIG_PM */ +ATTRIBUTE_GROUPS(soundbus_dev); static struct bus_type soundbus_bus_type = { .name = "aoa-soundbus", .probe = soundbus_probe, @@ -160,7 +161,7 @@ static struct bus_type soundbus_bus_type .suspend = soundbus_device_suspend, .resume = soundbus_device_resume, #endif - .dev_attrs = soundbus_dev_attrs, + .dev_groups = soundbus_dev_groups, }; int soundbus_add_one(struct soundbus_dev *dev) --- a/sound/aoa/soundbus/soundbus.h +++ b/sound/aoa/soundbus/soundbus.h @@ -199,6 +199,6 @@ struct soundbus_driver { extern int soundbus_register_driver(struct soundbus_driver *drv); extern void soundbus_unregister_driver(struct soundbus_driver *drv); -extern struct device_attribute soundbus_dev_attrs[]; +extern struct attribute *soundbus_dev_attrs[]; #endif /* __SOUNDBUS_H */ --- a/sound/aoa/soundbus/sysfs.c +++ b/sound/aoa/soundbus/sysfs.c @@ -30,13 +30,16 @@ static ssize_t modalias_show(struct devi return length; } +static DEVICE_ATTR_RO(modalias); soundbus_config_of_attr (name, "%s\n"); +static DEVICE_ATTR_RO(name); soundbus_config_of_attr (type, "%s\n"); +static DEVICE_ATTR_RO(type); -struct device_attribute soundbus_dev_attrs[] = { - __ATTR_RO(name), - __ATTR_RO(type), - __ATTR_RO(modalias), - __ATTR_NULL +struct attribute *soundbus_dev_attrs[] = { + &dev_attr_name.attr, + &dev_attr_type.attr, + &dev_attr_modalias.attr, + NULL, };

4 19

[alsa-devel] OPL3 on cmipci doesn't survive suspend/resume
by Adam Goode 10 Jun '15

10 Jun '15

Hi, I have this card: 05:00.0 Multimedia audio controller: C-Media Electronics Inc CMI8738/CMI8768 PCI Audio (rev 10) Subsystem: C-Media Electronics Inc CMI8738/C3DX PCI Audio Device Flags: bus master, stepping, medium devsel, latency 32, IRQ 19 I/O ports at d000 [size=256] Capabilities: [c0] Power Management version 2 Kernel driver in use: snd_cmipci Kernel modules: snd_cmipci When I suspend/resume, the sound from the OPL3 is permanently distorted. It sounds like not all of the operators are active. I can fix this by doing a full PCI remove/rescan cycle: the driver correctly initializes the card at this time. Any ideas before I peek into the code? Thanks, Adam

3 6

[alsa-devel] Front speakers doesn't work in multichannel output, regression in ALC888
by Łukasz Wojniłowicz 07 Jun '15

07 Jun '15

Hi all, My problem is that when I set channel output to "Analog output surround 5.1" (or 2.1 or 4.1), I hear no sound in front speakers, but in case of 5.1 or 4.1 I can hear sound in rear speakers. I use kernel 3.19.5 and it didn't happen in earlier kernels that is 3.18 and in 3.17 for sure. My configuration is: OS: Fedora 21 64 bit SoundCard: ALC888 Model name: acer-aspire-4930g Laptop: Acer Aspire 5930g Speakers: external 5.1 with 3 jacks Sound channel configuration module is standard configuration module from KDE. Additional info: 1) When channel output is 5.1 and I unplug green jack and leave two others jacks connected then I can hear sound in laptop internal speakers. 2) Earlier (kernel 3.18 and 3.17) I didn't have possibility to choose 2.1 configuration and additionally to 4.1 configuration I could also choose 4.0 configuration. Thanks for looking into problem. Cheers LW

3 3

[alsa-devel] Reflections on implementing Web MIDI on top of ALSA seq
by Adam Goode 05 Jun '15

05 Jun '15

Hi, Chrome 43 is now in beta, with Web MIDI support. (http://blog.chromium.org/2015/04/chrome-43-beta-web-midi-and-upgrading.html) The Linux (and Chrome OS) version of Chrome uses ALSA seq to implement Web MIDI. I wanted to reflect a bit on some of the issues I discovered while implementing this new API on top of seq. This is a little bit long, so the tl;dr is: * ALSA seq worked pretty well for implementing Web MIDI, but I need a way to get the card number for a given client, before my assumptions about the kernel break. Here is a quick overview of Web MIDI (http://www.w3.org/TR/webmidi/): - provides hotplug events for port connect/disconnect - incoming events are timestamped - outgoing events can be timestamped for future delivery by the system - timestamps are high precision, and use a monotonic clock - the port abstraction contains "name", "manufacturer", and "version" fields - open ports auto-reconnect if the port disappears and reappears, for both send and receive - input and output ports are distinct: there are no duplex ports - uses MIDI bytestreams (not an event structure), but requires full MIDI messages to be sent The initial prototype of Chrome's Web MIDI support was built on top of rawmidi. I rewrote it to use seq instead (to get multiple client and user client access). Here are my observations: - Getting the "manufacturer" is very hard from seq. I needed to join against udev data, which relies on the current implementation of ALSA in the kernel. These udev attributes are also used to match for transparent reconnect. - I could not use the kernel seq timestamp, either for send or receive, since I could not get it to just use a CLOCK_MONOTONIC offset. Instead, timestamping is done in userspace. - Hotplug was tricky, since I needed to listen to both seq events and udev events. I would prefer just to use udev, since I have to anyway. I definitely want to fix the kernel so that I can stop relying on a few implementation details. Here are the current assumptions I am making: - Card based clients start at 16. (I need to know which clients actually have cards) - Clients are in the same order as cards. - There is a 1:1 correspondence between clients and OPL3+rawmidi devices. One way to fix these assumptions would be to fully expose all seq events through sysfs. Right now, there is a seq device in sysfs but it has no information. Here are some ways that the kernel might be extended to simplify the code and/or fix bad assumptions: 1. Expose all seq clients+ports as kobjects, with a symlink to the card if it's a hardware device 2. Expose all subscriptions through sysfs 3. Add a simplified timestamp mechanism that just uses a configurable system clock, with at least CLOCK_MONOTONIC available (something like what sound/core/timer.c does with tread?) The first change would allow me to eliminate all the hardcoded assumptions about which cards correspond to which clients. I believe it would also allow me to drive the hotplug logic directly from udev, instead of both udev and seq. The second change is not strictly necessary, but would remove more need to react to seq events for some uses. The third change would allow me to use the kernel timestamp reliably, since right now I timestamp events with CLOCK_MONOTONIC in userspace. If I had to start today and create a new MIDI kernel interface for ALSA, it would look like this: not-quite-raw-midi: - hotplug events completely driven by sysfs - ability to interoperate with existing seq clients (for kernel and user clients) - non-exclusive access - reads and writes use a simple structured format, with timestamp and a midi message as bytes - no or minimal alsa-lib needed - one device file per port (no subdevices) - some mechanism for creating userspace clients, preferably with some number of key-value attributes (so I can report "manufacturer" and other things if the user client sets it) Thanks for reading these reflections. Comments are welcome. Adam

2 2

[alsa-devel] Still have problems/issues using SGTL5000 with i.MX28 CPU
by gianluca 04 Jun '15

04 Jun '15

Hello everybody! I put all those people on Cc: because of I think every guy can be able to handle the issue for its side easly. I started a discussion in FreeScale Community website: https://community.freescale.com/thread/356362 Basically I designed 4 boards using the IMX28EVK board as reference. Usually the audio section was a buzzer (pwm), or simply using a SGTL5000 as playback only. Now we need to record some sounds as soon as the SGTL5000 has the SAIF1 line used for caputure (line in / mic in). In alsamixer I can see all those stuff, and actually it works (for example if I bypass the ADC part to listen any MIC or LINE-IN into headphones directly) so I can safely exclude some alsa misprogramming code or whatever. I tested my bootlets, barebox bootloader, linux kernel 3.12.1 and Debian Wheezy 7.8 in both boards: * my board (namely EK340) * IMX28VK board. Both bootcodes and barebox bootloader are almost the same in both boards (some uart definitions differ). The linux kernel _IS_ the same. The device-tree blob are quite similar: Here is the IMX28EVK dts: > /* > * Copyright 2012 Freescale Semiconductor, Inc. > * > * The code contained herein is licensed under the GNU General Public > * License. You may obtain a copy of the GNU General Public License > * Version 2 or later at the following locations: > * > * http://www.opensource.org/licenses/gpl-license.html > * http://www.gnu.org/copyleft/gpl.html > */ > > /dts-v1/; > #include "imx28.dtsi" > > / { > /* > * Try to keep the name of the board unique (no slash, underscore, > * no fancy characters, no spaces, no dots...) in the second > * field of the model name. It will be used as board name. > */ > model = "Freescale IMX28EVK Evaluation Kit"; > compatible = "fsl,imx28-evk", "fsl,imx28"; > > memory { > reg = <0x40000000 0x08000000>; > }; > > apb@80000000 { > apbh@80000000 { > ssp0: ssp@80010000 { > compatible = "fsl,imx28-mmc"; > pinctrl-names = "default"; > pinctrl-0 = <&mmc0_8bit_pins > &mmc0_sck_cfg>; > bus-width = <8>; > wp-gpios = <&gpio2 12 0>; > vmmc-supply = <&reg_vddio_sd0>; > non-removable; > status = "okay"; > }; > > ssp1: ssp@80012000 { > compatible = "fsl,imx28-mmc"; > pinctrl-names = "default"; > pinctrl-0 = <&mmc1_4bit_pins > &mmc1_cd_cfg &mmc1_sck_cfg>; > bus-width = <4>; > wp-gpios = <&gpio0 28 0>; > vmmc-supply = <&reg_vddio_sd0>; > status = "okay"; > }; > > pinctrl@80018000 { > pinctrl-names = "default"; > pinctrl-0 = <&hog_pins_a>; > > hog_pins_a: hog@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x20d3 /* MX28_PAD_SSP1_CMD__GPIO_2_13 */ > 0x20f3 /* MX28_PAD_SSP1_DATA3__GPIO_2_15 */ > 0x40d3 /* MX28_PAD_ENET0_RX_CLK__GPIO_4_13 */ > 0x20c3 /* MX28_PAD_SSP1_SCK__GPIO_2_12 */ > 0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */ > 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */ > 0x3083 /* MX28_PAD_AUART2_RX__GPIO_3_8 */ > 0x3093 /* MX28_PAD_AUART2_TX__GPIO_3_9 */ > >; > fsl,drive-strength = <0>; > fsl,voltage = <1>; > fsl,pull-up = <0>; > }; > > rs485_tx_en: rx485-tx-en { > fsl,pinmux-ids = < > 0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */ > >; > fsl,drive-strength = <0>; > fsl,pull-up = <0>; > }; > > mmc0_8bit_pins: mmc0-8bit@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x2000 /* MX28_PAD_SSP0_DATA0__SSP0_D0 */ > 0x2010 /* MX28_PAD_SSP0_DATA1__SSP0_D1 */ > 0x2020 /* MX28_PAD_SSP0_DATA2__SSP0_D2 */ > 0x2030 /* MX28_PAD_SSP0_DATA3__SSP0_D3 */ > 0x2040 /* MX28_PAD_SSP0_DATA4__SSP0_D4 */ > 0x2050 /* MX28_PAD_SSP0_DATA5__SSP0_D5 */ > 0x2060 /* MX28_PAD_SSP0_DATA6__SSP0_D6 */ > 0x2070 /* MX28_PAD_SSP0_DATA7__SSP0_D7 */ > 0x2080 /* MX28_PAD_SSP0_CMD__SSP0_CMD */ > 0x20a0 /* MX28_PAD_SSP0_SCK__SSP0_SCK */ > >; > fsl,drive-strength = <1>; > fsl,voltage = <1>; > fsl,pull-up = <1>; > }; > > mmc1_4bit_pins: mmc1-4bit@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x0001 /* MX28_PAD_GPMI_D00__SSP1_D0 */ > 0x0011 /* MX28_PAD_GPMI_D01__SSP1_D1 */ > 0x0021 /* MX28_PAD_GPMI_D02__SSP1_D2 */ > 0x0031 /* MX28_PAD_GPMI_D03__SSP1_D3 */ > 0x0141 /* MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT */ > 0x0151 /* MX28_PAD_GPMI_RDY1__SSP1_CMD */ > 0x0191 /* MX28_PAD_GPMI_WRN__SSP1_SCK */ > >; > fsl,drive-strength = <1>; > fsl,voltage = <1>; > fsl,pull-up = <1>; > }; > > mmc1_sck_cfg: mmc1-sck-cfg { > fsl,pinmux-ids = < > 0x0191 /* MX28_PAD_GPMI_WRN__SSP1_SCK */ > >; > fsl,drive-strength = <1>; > fsl,pull-up = <0>; > }; > > mmc1_cd_cfg: mmc1-cd-cfg { > fsl,pinmux-ids = < > 0x0141 /* MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT */ > >; > fsl,pull-up = <0>; > }; > > lcdif_pins_evk: lcdif-evk@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */ > 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */ > 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */ > 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */ > >; > fsl,drive-strength = <0>; > fsl,voltage = <1>; > fsl,pull-up = <0>; > }; > > usb0_id_pins: usb0id@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x3071 /* MX28_PAD_AUART1_RTS__USB0_ID */ > >; > fsl,drive-strength = <2>; > fsl,voltage = <1>; > fsl,pull-up = <1>; > }; > > }; > > lcdif@80030000 { > pinctrl-names = "default"; > pinctrl-0 = <&lcdif_24bit_pins_a > &lcdif_pins_evk>; > lcd-supply = <&reg_lcd_3v3>; > display = <&display>; > status = "okay"; > > display: display { > bits-per-pixel = <32>; > bus-width = <24>; > > display-timings { > native-mode = <&timing0>; > timing0: timing0 { > clock-frequency = <33500000>; > hactive = <800>; > vactive = <480>; > hback-porch = <89>; > hfront-porch = <164>; > vback-porch = <23>; > vfront-porch = <10>; > hsync-len = <10>; > vsync-len = <10>; > hsync-active = <0>; > vsync-active = <0>; > de-active = <1>; > pixelclk-active = <0>; > }; > }; > }; > }; > > can0: can@80032000 { > pinctrl-names = "default"; > pinctrl-0 = <&can0_pins_a>; > xceiver-supply = <&reg_can_3v3>; > status = "okay"; > }; > > can1: can@80034000 { > pinctrl-names = "default"; > pinctrl-0 = <&can1_pins_a>; > xceiver-supply = <&reg_can_3v3>; > status = "okay"; > }; > }; > > apbx@80040000 { > saif0: saif@80042000 { > pinctrl-names = "default"; > pinctrl-0 = <&saif0_pins_a>; > status = "okay"; > }; > > saif1: saif@80046000 { > pinctrl-names = "default"; > pinctrl-0 = <&saif1_pins_a>; > fsl,saif-master = <&saif0>; > status = "okay"; > }; > > lradc@80050000 { > fsl,lradc-touchscreen-wires = <4>; > status = "okay"; > }; > > i2c0: i2c@80058000 { > pinctrl-names = "default"; > pinctrl-0 = <&i2c0_pins_a>; > clock-frequency = <400000>; > status = "okay"; > > sgtl5000: codec@0a { > compatible = "fsl,sgtl5000"; > reg = <0x0a>; > VDDA-supply = <&reg_3p3v>; > VDDIO-supply = <&reg_3p3v>; > clocks = <&saif0>; > }; > > at24@51 { > compatible = "at24,24c32"; > pagesize = <32>; > reg = <0x51>; > }; > }; > > pwm: pwm@80064000 { > pinctrl-names = "default"; > pinctrl-0 = <&pwm2_pins_a>; > status = "okay"; > }; > > duart: serial@80074000 { > pinctrl-names = "default"; > pinctrl-0 = <&duart_pins_a>; > status = "okay"; > }; > > auart0: serial@8006a000 { > pinctrl-names = "default"; > pinctrl-0 = <&auart0_pins_a>; > fsl,uart-has-rtscts; > status = "okay"; > }; > > auart3: serial@80070000 { > compatible = "fsl,imx28-ekuart"; > pinctrl-names = "default"; > pinctrl-0 = <&auart3_2pins_b > &rs485_tx_en>; > rs485-rts-active-high; > rts-gpio = <&gpio3 5 0>; > linux,rs485-enabled-at-boot-time; > rs485-rts-delay = <0 0>; > status = "okay"; > }; > > usbphy0: usbphy@8007c000 { > status = "okay"; > }; > > usbphy1: usbphy@8007e000 { > status = "okay"; > }; > }; > }; > > ahb@80080000 { > usb0: usb@80080000 { > pinctrl-names = "default"; > pinctrl-0 = <&usb0_id_pins > &usbphy0_pins_b>; > vbus-supply = <&reg_usb0_vbus>; > dr_mode = "otg"; > status = "okay"; > }; > > usb1: usb@80090000 { > pinctrl-names = "default"; > pinctrl-0 = <&usbphy1_pins_a>; > vbus-supply = <&reg_usb1_vbus>; > dr_mode = "host"; > status = "okay"; > }; > > mac0: ethernet@800f0000 { > phy-mode = "rmii"; > pinctrl-names = "default"; > pinctrl-0 = <&mac0_pins_a>; > phy-supply = <&reg_fec_3v3>; > phy-reset-gpios = <&gpio4 13 0>; > phy-reset-duration = <100>; > status = "okay"; > }; > > mac1: ethernet@800f4000 { > phy-mode = "rmii"; > pinctrl-names = "default"; > pinctrl-0 = <&mac1_pins_a>; > status = "okay"; > }; > }; > > regulators { > compatible = "simple-bus"; > > reg_3p3v: 3p3v { > compatible = "regulator-fixed"; > regulator-name = "3P3V"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > regulator-always-on; > }; > > reg_vddio_sd0: vddio-sd0 { > compatible = "regulator-fixed"; > regulator-name = "vddio-sd0"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > gpio = <&gpio3 28 0>; > }; > > reg_fec_3v3: fec-3v3 { > compatible = "regulator-fixed"; > regulator-name = "fec-3v3"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > gpio = <&gpio2 15 0>; > }; > > reg_usb0_vbus: usb0_vbus { > compatible = "regulator-fixed"; > regulator-name = "usb0_vbus"; > regulator-min-microvolt = <5000000>; > regulator-max-microvolt = <5000000>; > gpio = <&gpio3 9 0>; > enable-active-high; > }; > > reg_usb1_vbus: usb1_vbus { > compatible = "regulator-fixed"; > regulator-name = "usb1_vbus"; > regulator-min-microvolt = <5000000>; > regulator-max-microvolt = <5000000>; > gpio = <&gpio3 8 0>; > enable-active-high; > }; > > reg_lcd_3v3: lcd-3v3 { > compatible = "regulator-fixed"; > regulator-name = "lcd-3v3"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > gpio = <&gpio3 30 0>; > enable-active-high; > }; > > reg_can_3v3: can-3v3 { > compatible = "regulator-fixed"; > regulator-name = "can-3v3"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > gpio = <&gpio2 13 0>; > enable-active-high; > }; > > }; > > sound { > compatible = "fsl,imx28-evk-sgtl5000", > "fsl,mxs-audio-sgtl5000"; > model = "imx28-evk-sgtl5000"; > saif-controllers = <&saif0 &saif1>; > audio-codec = <&sgtl5000>; > }; > > backlight { > compatible = "pwm-backlight"; > pwms = <&pwm 2 5000000>; > brightness-levels = <0 4 8 16 32 64 128 255>; > default-brightness-level = <6>; > }; > }; and here the EK340 dts: > /* > * Copyright 2014 Eurek Elettronica S.r.l. > * > * The code contained herein is licensed under the GNU General Public > * License. You may obtain a copy of the GNU General Public License > * Version 2 or later at the following locations: > * > * http://www.opensource.org/licenses/gpl-license.html > * http://www.gnu.org/copyleft/gpl.html > */ > > /dts-v1/; > #include "imx28.dtsi" > > / { > model = "Eurek EK340 i.MX286"; > compatible = "eurek,ek340", "fsl,imx28"; > > memory { > reg = <0x40000000 0x08000000>; > }; > > apb@80000000 { > apbh@80000000 { > ssp0: ssp@80010000 { > compatible = "fsl,imx28-mmc"; > pinctrl-names = "default"; > pinctrl-0 = <&mmc0_8bit_pins > &mmc0_sck_cfg>; > bus-width = <8>; > vmmc-supply = <&reg_3p3v>; > non-removable; > status = "okay"; > }; > > ssp1: ssp@80012000 { > compatible = "fsl,imx28-mmc"; > pinctrl-names = "default"; > pinctrl-0 = <&mmc1_4bit_pins > &mmc1_cd_cfg &mmc1_sck_cfg>; > bus-width = <4>; > vmmc-supply = <&reg_vddio_sd1>; > status = "okay"; > }; > > ssp3: ssp@80016000 { > compatible = "fsl,imx28-sdio"; > pinctrl-names = "default"; > pinctrl-0 = <&mmc3_4bit_pins > &mmc3_sck_cfg>; > bus-width = <4>; > non-removable; > max-frequency = <25000000>; > status = "okay"; > }; > > pinctrl@80018000 { > pinctrl-names = "default"; > pinctrl-0 = <&hog_pins_a>; > > hog_pins_a: hog@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x0073 /* MX28_PAD_GPMI_D07__GPIO_0_7 LED */ > 0x0063 /* MX28_PAD_GPMI_D06__GPIO_0_6 WIFI PWREN */ > 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 FACT_RST */ > 0x2093 /* MX28_PAD_SSP0_DETECT__GPIO_2_9 MMC_nRST */ > 0x0043 /* MX28_PAD_GPMI_D04__GPIO_0_4 USB0_PWREN */ > 0x0123 /* MX28_PAD_GPMI_CE2N__GPIO_0_18 USB1_PWREN */ > 0x3013 /* MX28_PAD_AUART0_TX__GPIO_3_1 ENET_nRST */ > 0x3003 /* MX28_PAD_AUART0_RX__GPIO_3_0 ENET_INT */ > 0x0053 /* MX28_PAD_GPMI_D05__GPIO_0_5 LCD_PCI */ > 0x31b3 /* MX28_PAD_SPDIF__GPIO_3_27 BL_EN (I2C_INT) */ > 0x2123 /* MX28_PAD_SSP2_MISO__GPIO_2_18 EXT_INT */ > >; > fsl,drive-strength = <0>; > fsl,voltage = <1>; > fsl,pull-up = <0>; > }; > > rs485_tx_en: rx485-tx-en { > fsl,pinmux-ids = < > 0x2133 /* MX28_PAD_SSP2_SS0__GPIO_2_19 UART2_DIR */ > >; > fsl,drive-strength = <0>; > fsl,pull-up = <1>; > }; > > powerfail_pin: powerfail-pin { > fsl,pinmux-ids = < > 0x0133 /* MX28_PAD_GPMI_CE3N__GPIO_0_19 PWR_FAIL */ > >; > fsl,drive-strength = <0>; > fsl,pull-up = <0>; > }; > > mmc0_8bit_pins: mmc0-8bit@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x2000 /* MX28_PAD_SSP0_DATA0__SSP0_D0 */ > 0x2010 /* MX28_PAD_SSP0_DATA1__SSP0_D1 */ > 0x2020 /* MX28_PAD_SSP0_DATA2__SSP0_D2 */ > 0x2030 /* MX28_PAD_SSP0_DATA3__SSP0_D3 */ > 0x2040 /* MX28_PAD_SSP0_DATA4__SSP0_D4 */ > 0x2050 /* MX28_PAD_SSP0_DATA5__SSP0_D5 */ > 0x2060 /* MX28_PAD_SSP0_DATA6__SSP0_D6 */ > 0x2070 /* MX28_PAD_SSP0_DATA7__SSP0_D7 */ > 0x2080 /* MX28_PAD_SSP0_CMD__SSP0_CMD */ > 0x20a0 /* MX28_PAD_SSP0_SCK__SSP0_SCK */ > >; > fsl,drive-strength = <1>; > fsl,voltage = <1>; > fsl,pull-up = <1>; > }; > > mmc1_4bit_pins: mmc1-4bit@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x0001 /* MX28_PAD_GPMI_D00__SSP1_D0 */ > 0x0011 /* MX28_PAD_GPMI_D01__SSP1_D1 */ > 0x0021 /* MX28_PAD_GPMI_D02__SSP1_D2 */ > 0x0031 /* MX28_PAD_GPMI_D03__SSP1_D3 */ > 0x0141 /* MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT */ > 0x0151 /* MX28_PAD_GPMI_RDY1__SSP1_CMD */ > 0x0191 /* MX28_PAD_GPMI_WRN__SSP1_SCK */ > >; > fsl,drive-strength = <1>; > fsl,voltage = <1>; > fsl,pull-up = <1>; > }; > > mmc1_sck_cfg: mmc1-sck-cfg { > fsl,pinmux-ids = < > 0x0191 /* MX28_PAD_GPMI_WRN__SSP1_SCK */ > >; > fsl,drive-strength = <2>; > fsl,pull-up = <0>; > }; > > mmc1_cd_cfg: mmc1-cd-cfg { > fsl,pinmux-ids = < > 0x0141 /* MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT */ > >; > fsl,pull-up = <0>; > }; > > mmc3_4bit_pins: mmc3-4bit@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x0101 /* MX28_PAD_GPMI_CE0N__SSP3_D0 */ > 0x01a1 /* MX28_PAD_GPMI_ALE__SSP3_D1 */ > 0x01b1 /* MX28_PAD_GPMI_CLE__SSP3_D2 */ > 0x0111 /* MX28_PAD_GPMI_CE1N__SSP3_D3 */ > 0x01c1 /* MX28_PAD_GPMI_RESETN__SSP3_CMD */ > 0x0181 /* MX28_PAD_GPMI_RDN__SSP3_SCK */ > >; > fsl,drive-strength = <1>; > fsl,voltage = <1>; > fsl,pull-up = <1>; > }; > > mmc3_sck_cfg: mmc3-sck-cfg { > fsl,pinmux-ids = < > 0x0181 /* MX28_PAD_GPMI_RDN__SSP3_SCK */ > >; > fsl,drive-strength = <2>; > fsl,pull-up = <0>; > }; > > usb0_id_pins_b: usb0_id@1 { > reg = <0>; > fsl,pinmux-ids = < > 0x3121 /* MX28_PAD_PWM2__USB0_ID */ > >; > fsl,drive-strength = <2>; > fsl,voltage = <1>; > fsl,pull-up = <1>; > }; > > lcdif_pins_ek340: lcdif-ek340@0 { > reg = <0>; > fsl,pinmux-ids = < > 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */ > 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */ > 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */ > 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */ > >; > fsl,drive-strength = <0>; > fsl,voltage = <1>; > fsl,pull-up = <0>; > }; > }; > > lcdif@80030000 { > pinctrl-names = "default"; > pinctrl-0 = <&lcdif_24bit_pins_a > &lcdif_pins_ek340>; > lcd-supply = <&reg_lcd_3v3>; > > display = <&display16>; > status = "okay"; > > display16: display16 { > bits-per-pixel = <16>; > bus-width = <16>; > > display-timings { > native-mode = <&lms700kf23>; > > /* DISPLAY 800x480 SAMSUNG LMS700KF23 */ > lms700kf23: lms700kf23 { > clock-frequency = <24500000>; > hactive = <800>; > vactive = <480>; > hback-porch = <16>; > hfront-porch = <8>; > vback-porch = <8>; > vfront-porch = <5>; > hsync-len = <1>; > vsync-len = <1>; > hsync-active = <0>; > vsync-active = <0>; > de-active = <1>; > pixelclk-active = <0>; > }; > > /* DISPLAY 480x272 AMPIRE AM-480272Q */ > am480272q: am480272q { > clock-frequency = <9200000>; > hactive = <480>; > vactive = <272>; > hback-porch = <43>; > hfront-porch = <8>; > vback-porch = <12>; > vfront-porch = <4>; > hsync-len = <10>; > vsync-len = <41>; > hsync-active = <0>; > vsync-active = <0>; > de-active = <1>; > pixelclk-active = <0>; > }; > /* DISPLAY 1024x600 AMPIRE AM-1024600LTM LVDS */ > am1024600l: am1024600l { > clock-frequency = <51200000>; > hactive = <1024>; > vactive = <600>; > hback-porch = <0>; > hfront-porch = <320>; > vback-porch = <0>; > vfront-porch = <35>; > hsync-len = <1>; > vsync-len = <1>; > hsync-active = <0>; > vsync-active = <0>; > de-active = <1>; > pixelclk-active = <0>; > }; > }; > }; > > display24: display24 { > bits-per-pixel = <32>; > bus-width = <24>; > /* Timings for 24bit display go here... */ > }; > > }; > > can0: can@80032000 { > pinctrl-names = "default"; > pinctrl-0 = <&can0_pins_a>; > xceiver-supply = <&reg_3p3v>; > status = "okay"; > }; > }; > > > apbx@80040000 { > saif0: saif@80042000 { > pinctrl-names = "default"; > pinctrl-0 = <&saif0_pins_a>; > status = "okay"; > }; > > saif1: saif@80046000 { > pinctrl-names = "default"; > pinctrl-0 = <&saif1_pins_a>; > fsl,saif-master = <&saif0>; > status = "okay"; > }; > > lradc@80050000 { > fsl,lradc-touchscreen-wires = <4>; > status = "okay"; > }; > > i2c0: i2c@80058000 { > pinctrl-names = "default"; > pinctrl-0 = <&i2c0_pins_a>; > clock-frequency = <400000>; > status = "okay"; > > sgtl5000: codec@0a { > compatible = "fsl,sgtl5000"; > reg = <0x0a>; > VDDA-supply = <&reg_3p3v>; > VDDIO-supply = <&reg_3p3v>; > clocks = <&saif0>; > }; > > at24@50 { > compatible = "at24,24c64"; > pagesize = <64>; > reg = <0x50>; > }; > > pcf8563: rtc@51 { > compatible = "phg,pcf8563"; > reg = <0x51>; > }; > > /* > * ------------------------------------------------ > * There is no need to bind those devices to Linux > * Kernel space. They are usable with i2c tools and > * custom i2c userspace drivers anyway. > * !! Dangerous !! > * ------------------------------------------------ > pca9536: pca9536@41 { > compatible = "nxp,pca9536"; > gpio-controller; > reg = <0x41>; > }; > > at24@54 { > compatible = "at24,24c64"; > pagesize = <64>; > reg = <0x54>; > }; > > lm48100@7c { > compatible = "alsa-volume-ctrl"; > volume-controller; > reg = <0x7c>; > }; > * ------------------------------------------------ > */ > }; > > i2c1: i2c@8005a000 { > pinctrl-names = "default"; > pinctrl-0 = <&i2c1_pins_a>; > clock-frequency = <100000>; > status = "okay"; > }; > > pwm: pwm@80064000 { > compatible = "imx28-ek-pwm"; > reg = <0x80064000 0x2000>; > clocks = <&clks 44>; > #pwm-cells = <2>; > fsl,pwm-number = <8>; > pinctrl-names = "default"; > pinctrl-0 = <&pwm4_pins_a > &powerfail_pin>; > powerfail-active-low; > powerfail-gpio = <&gpio0 19 1>; > status = "okay"; > }; > > duart: serial@80074000 { > pinctrl-names = "default"; > pinctrl-0 = <&duart_pins_b>; > status = "okay"; > }; > > auart1: serial@8006c000 { > pinctrl-names = "default"; > pinctrl-0 = <&auart1_2pins_a>; > status = "okay"; > }; > > auart2: serial@8006e000 { > compatible = "fsl,imx28-ekuart"; > pinctrl-names = "default"; > pinctrl-0 = <&auart2_2pins_a > &rs485_tx_en>; > rs485-rts-active-low; > rts-gpio = <&gpio2 19 1>; > linux,rs485-enabled-at-boot-time; > rs485-rts-delay = <0 0>; > status = "okay"; > }; > > usbphy0: usbphy@8007c000 { > status = "okay"; > }; > > usbphy1: usbphy@8007e000 { > status = "okay"; > }; > }; > }; > > ahb@80080000 { > usb0: usb@80080000 { > pinctrl-names = "default"; > pinctrl-0 = <&usb0_id_pins_b > &usbphy0_pins_a>; > vbus-supply = <&reg_usb0_vbus>; > dr_mode = "otg"; > status = "okay"; > }; > > usb1: usb@80090000 { > pinctrl-names = "default"; > pinctrl-0 = <&usbphy1_pins_a>; > vbus-supply = <&reg_usb1_vbus>; > dr_mode = "host"; > status = "okay"; > }; > > mac0: ethernet@800f0000 { > phy-mode = "rmii"; > pinctrl-names = "default"; > pinctrl-0 = <&mac0_pins_a>; > phy-supply = <&reg_3p3v>; > phy-reset-gpios = <&gpio3 1 0>; > phy-reset-duration = <100>; > status = "okay"; > }; > }; > > regulators { > compatible = "simple-bus"; > > reg_3p3v: 3p3v { > compatible = "regulator-fixed"; > regulator-name = "3P3V"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > regulator-always-on; > }; > > reg_vddio_sd1: vddio-sd1 { > compatible = "regulator-fixed"; > regulator-name = "vddio-sd1"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > gpio = <&gpio3 28 0>; > }; > > reg_usb0_vbus: usb0_vbus { > compatible = "regulator-fixed"; > regulator-name = "usb0_vbus"; > regulator-min-microvolt = <5000000>; > regulator-max-microvolt = <5000000>; > gpio = <&gpio0 4 0>; > enable-active-low; > }; > > reg_usb1_vbus: usb1_vbus { > compatible = "regulator-fixed"; > regulator-name = "usb1_vbus"; > regulator-min-microvolt = <5000000>; > regulator-max-microvolt = <5000000>; > gpio = <&gpio0 18 0>; > enable-active-low; > }; > > reg_lcd_3v3: lcd-3v3 { > compatible = "regulator-fixed"; > regulator-name = "lcd-3v3"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > gpio = <&gpio0 5 0>; > enable-active-high; > }; > }; > > sound { > compatible = "fsl,imx28-evk-sgtl5000", > "fsl,mxs-audio-sgtl5000"; > model = "imx28-evk-sgtl5000"; > saif-controllers = <&saif0 &saif1>; > audio-codec = <&sgtl5000>; > }; > > backlight { > compatible = "pwm-backlight"; > pwms = <&pwm 4 5000000>; > brightness-levels = <0 4 8 16 32 64 128 255>; > default-brightness-level = <6>; > }; > > }; As you can see the audio section _IS_ almost equal. In both boards (IMX28EVK and EK340) the VDDD pin is left floating so it uses the internal ldo voltage regulator. In IMX28EVK and in EK340 the VDDIO is from the VDDIO_3V3 from the SoC pin. In IMX28EVK the VDDA in tied/coupled with a choke (L2 470Ohm) to VDDIO, but in EK340 is using an external 3V3 voltage regulator that is triggered by VDDIO_3V3 to obtain the 3V3 voltage to the VDDA, so I can assume it is _almost_ the same. The same voltage regulator is used as power supply to all i2c stuff (RTC, EEPROM, GPIO Expander,...). VDDIO_3V3 from Soc is quite limited as current output so I choose to use an external 3V3 regulator. If I run: > arecord -t wav -d 5 -d hw:0,1 -f S16_LE -c 2 /tmp/sample.wav in the IMX28EVK it works as expected (I can clearly see I2C lines moving and SAIF1 lines moving too...) in the EK340 I can see the same lines moving (I2C and SAIF1) _BUT_ it hangs for 10 seconds and fails with an error: > arecord: pcm_read:1801: read error: Input/output error and the only thing it writes it is the WAV HEADER (44 bytes). I saw all stuff regarding SGTL5000 issues on the FSL Community: > https://community.freescale.com/thread/300291 > https://community.freescale.com/message/328708#328708 > https://community.freescale.com/thread/307611#331003 and this morning I found this too: > https://community.freescale.com/message/496426#496426 Now I can check this out too, but I am very UNCONFIDENT it will NO USEFUL to me, as in the EVK everything is working, meanwhile in EK340 it does not work for record, but only for playback... :-( Last but not least the boards are different by SoC version: IMX28EVK is using i.MX287 EK340 is using i.MX286 Any help, clue or whatever I can check and try to find out this problem??? Thank you in advance, Gianluca Renzi -- Eurek s.r.l. | Electronic Engineering | http://www.eurek.it via Celletta 8/B, 40026 Imola, Italy | Phone: +39-(0)542-609120 p.iva 00690621206 - c.f. 04020030377 | Fax: +39-(0)542-609212

2 4

[alsa-devel] [PATCH v3 0/6] Support ZTE zx296702 SPDIF/I2S
by Jun Nie 04 Jun '15

04 Jun '15

Changes vs v2: - remove pcm dma driver and merge the related call into DAI driver - Add zx HDMI codec with direct HDMI function call - Other typo and minor fix Jun Nie (6): dt: Add documentation for the ZTE SPDIF controller dt: Add documentation for the ZTE I2S controller dt: Add doc for the ZTE HDMI audio codec binding ASoC: zx: Add zx296702 SPDIF support ASoC: zx: Add ZTE zx296702 I2S DAI driver ASoC: zx: add zx296702 hdmi codec .../devicetree/bindings/sound/zte,zx-hdmi.txt | 10 + .../devicetree/bindings/sound/zte,zx-i2s.txt | 44 +++ .../devicetree/bindings/sound/zte,zx-spdif.txt | 28 ++ include/sound/zx_hdmi_audio.h | 7 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 3 + sound/soc/codecs/Makefile | 1 + sound/soc/codecs/zx296702_hdmi.c | 121 ++++++ sound/soc/zte/Kconfig | 17 + sound/soc/zte/Makefile | 2 + sound/soc/zte/zx296702-i2s.c | 437 +++++++++++++++++++++ sound/soc/zte/zx296702-spdif.c | 370 +++++++++++++++++ 13 files changed, 1042 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/zte,zx-hdmi.txt create mode 100644 Documentation/devicetree/bindings/sound/zte,zx-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/zte,zx-spdif.txt create mode 100644 include/sound/zx_hdmi_audio.h create mode 100644 sound/soc/codecs/zx296702_hdmi.c create mode 100644 sound/soc/zte/Kconfig create mode 100644 sound/soc/zte/Makefile create mode 100644 sound/soc/zte/zx296702-i2s.c create mode 100644 sound/soc/zte/zx296702-spdif.c -- 1.9.1

3 18

[alsa-devel] [PATCH v3 1/3] ASoC: topology: Add topology UAPI header
by Liam Girdwood 03 Jun '15

03 Jun '15

The ASoC topology UAPI header defines the structures required to define any DSP firmware audio topology and control objects from userspace. The following objects are supported :- o kcontrols including TLV controls. o DAPM widgets and graph elements o Vendor bespoke objects. o Coefficient data o FE PCM capabilities and config. o BE link capabilities and config. o Codec <-> codec link capabilities and config. o Topology object manifest. The file format is simple and divided into blocks for each object type and each block has a header that defines it's size and type. Blocks can be in any order of type and can either all be in a single file or spread across more than one file. Blocks also have a group identifier ID so that they can be loaded and unloaded by ID. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc-dapm.h | 1 + include/uapi/sound/asoc.h | 388 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 389 insertions(+) create mode 100644 include/uapi/sound/asoc.h diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 1065095..6f440b2 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -15,6 +15,7 @@ #include <linux/types.h> #include <sound/control.h> +#include <sound/asoc.h> struct device; diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h new file mode 100644 index 0000000..1221520 --- /dev/null +++ b/include/uapi/sound/asoc.h @@ -0,0 +1,388 @@ +/* + * uapi/sound/asoc.h -- ALSA SoC Firmware Controls and DAPM + * + * Copyright (C) 2012 Texas Instruments Inc. + * Copyright (C) 2015 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Simple file API to load FW that includes mixers, coefficients, DAPM graphs, + * algorithms, equalisers, DAIs, widgets etc. +*/ + +#ifndef __LINUX_UAPI_SND_ASOC_H +#define __LINUX_UAPI_SND_ASOC_H + +#include <linux/types.h> +#include <sound/asound.h> + +/* + * Maximum number of channels topology kcontrol can represent. + */ +#define SND_SOC_TPLG_MAX_CHAN 8 + +/* + * Maximum number of PCM formats capability + */ +#define SND_SOC_TPLG_MAX_FORMATS 16 + +/* + * Maximum number of PCM stream configs + */ +#define SND_SOC_TPLG_STREAM_CONFIG_MAX 8 + +/* individual kcontrol info types - can be mixed with other types */ +#define SND_SOC_TPLG_CTL_VOLSW 1 +#define SND_SOC_TPLG_CTL_VOLSW_SX 2 +#define SND_SOC_TPLG_CTL_VOLSW_XR_SX 3 +#define SND_SOC_TPLG_CTL_ENUM 4 +#define SND_SOC_TPLG_CTL_BYTES 5 +#define SND_SOC_TPLG_CTL_ENUM_VALUE 6 +#define SND_SOC_TPLG_CTL_RANGE 7 +#define SND_SOC_TPLG_CTL_STROBE 8 + + +/* individual widget kcontrol info types - can be mixed with other types */ +#define SND_SOC_TPLG_DAPM_CTL_VOLSW 64 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE 65 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT 66 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE 67 +#define SND_SOC_TPLG_DAPM_CTL_PIN 68 + +/* DAPM widget types - add new items to the end */ +#define SND_SOC_TPLG_DAPM_INPUT 0 +#define SND_SOC_TPLG_DAPM_OUTPUT 1 +#define SND_SOC_TPLG_DAPM_MUX 2 +#define SND_SOC_TPLG_DAPM_MIXER 3 +#define SND_SOC_TPLG_DAPM_PGA 4 +#define SND_SOC_TPLG_DAPM_OUT_DRV 5 +#define SND_SOC_TPLG_DAPM_ADC 6 +#define SND_SOC_TPLG_DAPM_DAC 7 +#define SND_SOC_TPLG_DAPM_SWITCH 8 +#define SND_SOC_TPLG_DAPM_PRE 9 +#define SND_SOC_TPLG_DAPM_POST 10 +#define SND_SOC_TPLG_DAPM_AIF_IN 11 +#define SND_SOC_TPLG_DAPM_AIF_OUT 12 +#define SND_SOC_TPLG_DAPM_DAI_IN 13 +#define SND_SOC_TPLG_DAPM_DAI_OUT 14 +#define SND_SOC_TPLG_DAPM_DAI_LINK 15 +#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK + +/* Header magic number and string sizes */ +#define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */ + +/* string sizes */ +#define SND_SOC_TPLG_NUM_TEXTS 16 + +/* ABI version */ +#define SND_SOC_TPLG_ABI_VERSION 0x2 + +/* Max size of TLV data */ +#define SND_SOC_TPLG_TLV_SIZE 32 + +/* + * File and Block header data types. + * Add new generic and vendor types to end of list. + * Generic types are handled by the core whilst vendors types are passed + * to the component drivers for handling. + */ +#define SND_SOC_TPLG_TYPE_MIXER 1 +#define SND_SOC_TPLG_TYPE_BYTES 2 +#define SND_SOC_TPLG_TYPE_ENUM 3 +#define SND_SOC_TPLG_TYPE_DAPM_GRAPH 4 +#define SND_SOC_TPLG_TYPE_DAPM_WIDGET 5 +#define SND_SOC_TPLG_TYPE_DAI_LINK 6 +#define SND_SOC_TPLG_TYPE_PCM 7 +#define SND_SOC_TPLG_TYPE_MANIFEST 8 +#define SND_SOC_TPLG_TYPE_CODEC_LINK 9 +#define SND_SOC_TPLG_TYPE_MAX SND_SOC_TPLG_TYPE_CODEC_LINK + +/* vendor block IDs - please add new vendor types to end */ +#define SND_SOC_TPLG_TYPE_VENDOR_FW 1000 +#define SND_SOC_TPLG_TYPE_VENDOR_CONFIG 1001 +#define SND_SOC_TPLG_TYPE_VENDOR_COEFF 1002 +#define SND_SOC_TPLG_TYPEVENDOR_CODEC 1003 + +#define SND_SOC_TPLG_STREAM_PLAYBACK 0 +#define SND_SOC_TPLG_STREAM_CAPTURE 1 + +/* + * Block Header. + * This header preceeds all object and object arrays below. + */ +struct snd_soc_tplg_hdr { + __le32 magic; /* magic number */ + __le32 abi; /* ABI version */ + __le32 version; /* optional vendor specific version details */ + __le32 type; /* SND_SOC_TPLG_TYPE_ */ + __le32 size; /* size of this structure */ + __le32 vendor_type; /* optional vendor specific type info */ + __le32 payload_size; /* data bytes, excluding this header */ + __le32 index; /* identifier for block */ + __le32 count; /* number of elements in block */ +} __attribute__((packed)); + +/* + * Private data. + * All topology objects may have private data that can be used by the driver or + * firmware. Core will ignore this data. + */ +struct snd_soc_tplg_private { + __le32 size; /* in bytes of private data */ + char data[0]; +} __attribute__((packed)); + +/* + * Kcontrol TLV data. + */ +struct snd_soc_tplg_ctl_tlv { + __le32 size; /* in bytes aligned to 4 */ + __le32 numid; /* control element numeric identification */ + __le32 count; /* number of elem in data array */ + __le32 data[SND_SOC_TPLG_TLV_SIZE]; +} __attribute__((packed)); + +/* + * Kcontrol channel data + */ +struct snd_soc_tplg_channel { + __le32 size; /* in bytes of this structure */ + __le32 reg; + __le32 shift; + __le32 id; /* ID maps to Left, Right, LFE etc */ +} __attribute__((packed)); + +/* + * Kcontrol Operations IDs + */ +struct snd_soc_tplg_kcontrol_ops_id { + __le32 get; + __le32 put; + __le32 info; +} __attribute__((packed)); + +/* + * kcontrol header + */ +struct snd_soc_tplg_ctl_hdr { + __le32 size; /* in bytes of this structure */ + __le32 type; + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 access; + struct snd_soc_tplg_kcontrol_ops_id ops; + __le32 tlv_size; /* non zero means control has TLV data */ +} __attribute__((packed)); + +/* + * Stream Capabilities + */ +struct snd_soc_tplg_stream_caps { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le64 formats[SND_SOC_TPLG_MAX_FORMATS]; /* supported formats SNDRV_PCM_FMTBIT_* */ + __le32 rates; /* supported rates SNDRV_PCM_RATE_* */ + __le32 rate_min; /* min rate */ + __le32 rate_max; /* max rate */ + __le32 channels_min; /* min channels */ + __le32 channels_max; /* max channels */ + __le32 periods_min; /* min number of periods */ + __le32 periods_max; /* max number of periods */ + __le32 period_size_min; /* min period size bytes */ + __le32 period_size_max; /* max period size bytes */ + __le32 buffer_size_min; /* min buffer size bytes */ + __le32 buffer_size_max; /* max buffer size bytes */ +} __attribute__((packed)); + +/* + * FE or BE Stream configuration supported by SW/FW + */ +struct snd_soc_tplg_stream { + __le32 size; /* in bytes of this structure */ + __le64 format; /* SNDRV_PCM_FMTBIT_* */ + __le32 rate; /* SNDRV_PCM_RATE_* */ + __le32 period_bytes; /* size of period in bytes */ + __le32 buffer_bytes; /* size of buffer in bytes */ + __le32 channels; /* channels */ + __le32 tdm_slot; /* optional BE bitmask of supported TDM slots */ + __le32 dai_fmt; /* SND_SOC_DAIFMT_ */ +} __attribute__((packed)); + +/* + * Duplex stream configuration supported by SW/FW. + */ +struct snd_soc_tplg_stream_config { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + struct snd_soc_tplg_stream playback; + struct snd_soc_tplg_stream capture; +} __attribute__((packed)); + +/* + * Manifest. List totals for each payload type. Not used in parsing, but will + * be passed to the component driver before any other objects in order for any + * global componnent resource allocations. + * + * File block representation for manifest :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_manifest | 1 | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_manifest { + __le32 size; /* in bytes of this structure */ + __le32 control_elems; /* number of control elements */ + __le32 widget_elems; /* number of widget elements */ + __le32 graph_elems; /* number of graph elements */ + __le32 dai_elems; /* number of DAI elements */ + __le32 dai_link_elems; /* number of DAI link elements */ +} __attribute__((packed)); + +/* + * Mixer kcontrol. + * + * File block representation for mixer kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_mixer_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_mixer_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 min; + __le32 max; + __le32 platform_max; + __le32 invert; + __le32 num_channels; + struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN]; + struct snd_soc_tplg_ctl_tlv tlv; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Enumerated kcontrol + * + * File block representation for enum kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_enum_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_enum_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 num_channels; + struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN]; + __le32 items; + __le32 mask; + __le32 count; + char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 values[SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN / 4]; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Bytes kcontrol + * + * File block representation for bytes kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_bytes_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_bytes_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 max; + __le32 mask; + __le32 base; + __le32 num_regs; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * DAPM Graph Element + * + * File block representation for DAPM graph elements :- + * +-------------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-------------------------------------+----+ + * | struct snd_soc_tplg_dapm_graph_elem | N | + * +-------------------------------------+----+ + */ +struct snd_soc_tplg_dapm_graph_elem { + char sink[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char control[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char source[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; +} __attribute__((packed)); + +/* + * DAPM Widget. + * + * File block representation for DAPM widget :- + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_dapm_widget | N | + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_enum_control | 0|1 | + * | struct snd_soc_tplg_mixer_control | 0|N | + * +-------------------------------------+-----+ + * + * Optional enum or mixer control can be appended to the end of each widget + * in the block. + */ +struct snd_soc_tplg_dapm_widget { + __le32 size; /* in bytes of this structure */ + __le32 id; /* SND_SOC_DAPM_CTL */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char sname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + __le32 reg; /* negative reg = no direct dapm */ + __le32 shift; /* bits to shift */ + __le32 mask; /* non-shifted mask */ + __u32 invert; /* invert the power bit */ + __u32 ignore_suspend; /* kept enabled over suspend */ + __u16 event_flags; + __u16 event_type; + __u16 num_kcontrols; + struct snd_soc_tplg_private priv; + /* + * kcontrols that relate to this widget + * follow here after widget private data + */ +} __attribute__((packed)); + +struct snd_soc_tplg_pcm_cfg_caps { + struct snd_soc_tplg_stream_caps caps; + struct snd_soc_tplg_stream_config configs[SND_SOC_TPLG_STREAM_CONFIG_MAX]; + __le32 num_configs; /* number of configs */ +} __attribute__((packed)); + +/* + * Describes SW/FW specific features of PCM or DAI link. + * + * File block representation for PCM/DAI-Link :- + * +-----------------------------------+-----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+-----+ + * | struct snd_soc_tplg_dapm_pcm_dai | N | + * +-----------------------------------+-----+ + */ +struct snd_soc_tplg_pcm_dai { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 id; /* unique ID - used to match */ + __le32 playback; /* supports playback mode */ + __le32 capture; /* supports capture mode */ + __le32 compress; /* 1 = compressed; 0 = PCM */ + struct snd_soc_tplg_pcm_cfg_caps capconf[2]; /* capabilities and configs */ +} __attribute__((packed)); + +#endif -- 2.1.4

3 5

[alsa-devel] [PATCH v2 1/2] ASoC: rt5645: change gpio to gpiod APIs
by Bard Liao 03 Jun '15

03 Jun '15

Move gpio to gpio_desc and use gpiod APIs in codec driver. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- include/sound/rt5645.h | 3 --- sound/soc/codecs/rt5645.c | 47 +++++++++++++---------------------------------- sound/soc/codecs/rt5645.h | 1 + 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index 652cb9e..22734bc 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h @@ -20,9 +20,6 @@ struct rt5645_platform_data { unsigned int dmic2_data_pin; /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */ - unsigned int hp_det_gpio; - bool gpio_hp_det_active_high; - unsigned int jd_mode; }; diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index aaede45..0cb4942 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2938,17 +2938,11 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645) switch (rt5645->pdata.jd_mode) { case 0: /* Not using rt5645 JD */ - if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) { - gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); - dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n", - rt5645->pdata.hp_det_gpio, gpio_state); - } - if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || - (!rt5645->pdata.gpio_hp_det_active_high && - !gpio_state)) { - report = rt5645_jack_detect(rt5645->codec, 1); - } else { - report = rt5645_jack_detect(rt5645->codec, 0); + if (rt5645->gpiod_hp_det) { + gpio_state = gpiod_get_value(rt5645->gpiod_hp_det); + dev_dbg(rt5645->codec->dev, "gpio_state = %d\n", + gpio_state); + report = rt5645_jack_detect(rt5645->codec, gpio_state); } snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE); @@ -3253,19 +3247,17 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, } else { if (dmi_check_system(dmi_platform_intel_braswell)) { rt5645->pdata = *rt5645_pdata; - gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); - - if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) { - rt5645->pdata.hp_det_gpio = -1; - dev_err(&i2c->dev, "failed to initialize gpiod\n"); - } else { - rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod); - rt5645->pdata.gpio_hp_det_active_high - = !gpiod_is_active_low(gpiod); - } } } + rt5645->gpiod_hp_det = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); + + if (IS_ERR(rt5645->gpiod_hp_det) || + gpiod_direction_input(rt5645->gpiod_hp_det)) { + rt5645->gpiod_hp_det = NULL; + dev_err(&i2c->dev, "failed to initialize gpiod\n"); + } + rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap); if (IS_ERR(rt5645->regmap)) { ret = PTR_ERR(rt5645->regmap); @@ -3425,16 +3417,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret); } - if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) { - ret = gpio_request(rt5645->pdata.hp_det_gpio, "rt5645"); - if (ret) - dev_err(&i2c->dev, "Fail gpio_request hp_det_gpio\n"); - - ret = gpio_direction_input(rt5645->pdata.hp_det_gpio); - if (ret) - dev_err(&i2c->dev, "Fail gpio_direction hp_det_gpio\n"); - } - INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work); return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645, @@ -3450,9 +3432,6 @@ static int rt5645_i2c_remove(struct i2c_client *i2c) cancel_delayed_work_sync(&rt5645->jack_detect_work); - if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) - gpio_free(rt5645->pdata.hp_det_gpio); - snd_soc_unregister_codec(&i2c->dev); return 0; diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index 9ec4e89..0353a6a 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -2182,6 +2182,7 @@ struct rt5645_priv { struct rt5645_platform_data pdata; struct regmap *regmap; struct i2c_client *i2c; + struct gpio_desc *gpiod_hp_det; struct snd_soc_jack *hp_jack; struct snd_soc_jack *mic_jack; struct snd_soc_jack *btn_jack; -- 1.8.1.1.439.g50a6b54

4 8

[alsa-devel] [PATCH 0/5] OMAPDSS: HDMI audio compliance fixes
by Jyri Sarha 03 Jun '15

03 Jun '15

I have rebased these patches from ti-linux-3.14.y on top of Linux 4.0.0. I tested them briefly on OMAP4 and OMAP5 in my environment, but I could not test any channel count beyond stereo. However, there were no conflicts in the rebase and each fix makes sense when looking at the chip TRM and the relevant HDMI specs. All the changes are really minor, but most of them apply to OMAPDSS side, so it is probably best to merge them trough there. Best regards, Jyri Misael Lopez Cruz (5): OMAPDSS: HDMI4: Set correct CC for 8-channels layout OMAPDSS: HDMI5: Set valid sample order OMAPDSS: HDMI5: Fix AUDICONF3 bitfield offsets ASoC: omap-hdmi-audio: Force channel allocation only for OMAP4 ASoC: omap-hdmi-audio: Fix invalid combination of DM_INH and CA drivers/video/fbdev/omap2/dss/hdmi4_core.c | 12 +++++++++++- drivers/video/fbdev/omap2/dss/hdmi5_core.c | 5 ++++- sound/soc/omap/omap-hdmi-audio.c | 12 +++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) -- 1.9.1

3 8

[alsa-devel] [PATCH v4 0/3] ASoC: qcom: add support to apq8016 audio
by Srinivas Kandagatla 03 Jun '15

03 Jun '15

Hi Mark, Thanks for applying the patches. Am resending the leftover patches rebased on top of topic/qcom branch. I have funtionally tested these patches on AP8016-SBC board and also compile tested them without CONFIG_OF on x86 to make sure nothing breaks. All these patches are tested and Acked. I Also included Arnd's Patch to fix Kconfig dependency on STORM board. APQ8016 has 4 MI2S( Primary, Secondary, Tertiary, Quaternary) which can be routed to internal wcd codec or external codecs. This routing is controlled by 2 mux registers. Changes since v3 - dropped OF dependency patch - dropped 6 patches which are already applied by Mark. - fixed Kconfig as suggested by Arnd. Changes since v2(https://lkml.org/lkml/2015/5/16/236) - dropped 3 patches which are already applied by Mark. - rebased on top of topic/qcom branch. - changed dev_err to dev_warn spotted by Kenneth. - fixed typo spotted by kenneth. Changes since v1(https://lwn.net/Articles/644266/) - Fixed Kconfig dependencies spotted by Kenneth - Fixed compilation error on ipq806x spotted by Kenneth - Fixed clk error messages spotted by Kenneth Changes since RFC(https://lwn.net/Articles/642661/) - droped cleanup patches, as they are already applied by Mark. - prefixed shared functions with asoc_qcom_* as suggested by Kenneth - made LPASS driver depended on OF. - removed ipq806x specific bits from ipaif_reg.h - removed no_osr clk flag as suggested by Mark and Kenneth - fixed irq return values spotted by Kenneth - renamed the machine file to apq8016-sbc.c as suggested by Kenneth. - use dai->driver->id instead of dai->id as it breaks on Storm board. --srini Arnd Bergmann (1): ASoC: qcom: fix STORM board Kconfig Srinivas Kandagatla (2): ASoC: qcom: Add apq8016 lpass driver support ASoC: qcom: add apq8016 sound card support include/dt-bindings/sound/apq8016-lpass.h | 9 ++ sound/soc/qcom/Kconfig | 17 ++- sound/soc/qcom/Makefile | 4 + sound/soc/qcom/apq8016_sbc.c | 215 ++++++++++++++++++++++++++ sound/soc/qcom/lpass-apq8016.c | 242 ++++++++++++++++++++++++++++++ sound/soc/qcom/lpass.h | 4 + 6 files changed, 490 insertions(+), 1 deletion(-) create mode 100644 include/dt-bindings/sound/apq8016-lpass.h create mode 100644 sound/soc/qcom/apq8016_sbc.c create mode 100644 sound/soc/qcom/lpass-apq8016.c -- 1.9.1

3 9