forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'sound-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/tiwai/sound
Pull sound updates from Takashi Iwai:
"We've had quite busy weeks in this cycle. Looking at ALSA core, the
significant changes are a few fixes wrt timer and sequencer ioctls
that have been revealed by fuzzer recently. Other than that, ASoC
core got a few updates about DAI link handling, but these are rather
straightforward refactoring.
In drivers scene, ASoC received quite lots of new drivers in addition
to bunch of updates for still ongoing Intel Skylake support and
topology API. HD-audio gained a new HDMI/DP hotplug notification via
component. FireWire got a pile of code refactoring/updates with
SCS.1x driver integration.
More highlights are shown below.
[ NOTE: this contains also many commits for DRM. This is due to the
pull of drm stable branch into sound tree, as the base of i915 audio
component work for HD-audio. The highlights below don't contain
these DRM changes, as these are supposed to be pulled via drm tree
in anyway sooner or later. ]
Core:
- Handful fixes to harden ALSA timer and sequencer ioctls against
races reported by syzkaller fuzzer
- Irq description string can be unique to each card; only for
HD-audio for now
ASoC:
- Conversion of the array of DAI links to a list for supporting
dynamically adding and removing DAI links
- Topology API enhancements to make everything more component based
and being able to specify PCM links via topology
- Some more fixes for the topology code, though it is still not final
and ready for enabling in production; we really need to get to the
point where that can be done
- A pile of changes for Intel SkyLake drivers which hopefully deliver
some useful initial functionality for systems with this chipset,
though there is more work still to come
- Lots of new features and cleanups for the Renesas drivers
- ANC support for WM5110
- New drivers: Imagination Technologies IPs, Atmel class D speaker,
Cirrus CS47L24 and WM1831, Dialog DA7128, Realtek RT5659 and
RT56156, Rockchip RK3036, TI PC3168A, and AMD ACP
- Rename PCM1792a driver to be generic pcm179x
HD-Audio:
- Use audio component for i915 HDMI/DP hotplug handling
- On-demand binding with i915 driver
- bdl_pos_adj parameter adjustment for Baytrail controllers
- Enable power_save_node for CX20722; this shouldn't lead to
regression, hopefully
- Kabylake HDMI/DP codec support
- Quirks for Lenovo E50-80, Dell Latitude E-series, and other Dell
machines
- A few code refactoring
FireWire:
- Lots of code cleanup and refactoring
- Integrate the support of SCS.1x devices into snd-oxfw driver;
snd-scs1x driver is obsoleted
USB-audio:
- Fix possible NULL dereference at disconnection
- A regression fix for Native Instruments devices
Misc:
- A few code cleanups of fm801 driver"
* tag 'sound-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (722 commits)
ALSA: timer: Code cleanup
ALSA: timer: Harden slave timer list handling
ALSA: hda - Add fixup for Dell Latitidue E6540
ALSA: timer: Fix race among timer ioctls
ALSA: hda - add codec support for Kabylake display audio codec
ALSA: timer: Fix double unlink of active_list
ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices
ALSA: hda - fix the headset mic detection problem for a Dell laptop
ALSA: hda - Fix white noise on Dell Latitude E5550
ALSA: hda_intel: add card number to irq description
ALSA: seq: Fix race at timer setup and close
ALSA: seq: Fix missing NULL check at remove_events ioctl
ALSA: usb-audio: Avoid calling usb_autopm_put_interface() at disconnect
ASoC: hdac_hdmi: remove unused hdac_hdmi_query_pin_connlist
ASoC: AMD: Add missing include file
ALSA: hda - Fixup inverted internal mic for Lenovo E50-80
ALSA: usb: Add native DSD support for Oppo HA-1
ASoC: Make aux_dev more like a generic component
ASoC: bcm2835: cleanup includes by ordering them alphabetically
ASoC: AMD: Manage ACP 2.x SRAM banks power
...- Loading branch information
Showing
430 changed files
with
45,195 additions
and
10,422 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| * Atmel PDMIC driver under ALSA SoC architecture | ||
|
|
||
| Required properties: | ||
| - compatible | ||
| Should be "atmel,sama5d2-pdmic". | ||
| - reg | ||
| Should contain PDMIC registers location and length. | ||
| - interrupts | ||
| Should contain the IRQ line for the PDMIC. | ||
| - dmas | ||
| One DMA specifiers as described in atmel-dma.txt and dma.txt files. | ||
| - dma-names | ||
| Must be "rx". | ||
| - clock-names | ||
| Required elements: | ||
| - "pclk" peripheral clock | ||
| - "gclk" generated clock | ||
| - clocks | ||
| Must contain an entry for each required entry in clock-names. | ||
| Please refer to clock-bindings.txt. | ||
| - atmel,mic-min-freq | ||
| The minimal frequency that the micphone supports. | ||
| - atmel,mic-max-freq | ||
| The maximal frequency that the micphone supports. | ||
|
|
||
| Optional properties: | ||
| - pinctrl-names, pinctrl-0 | ||
| Please refer to pinctrl-bindings.txt. | ||
| - atmel,model | ||
| The user-visible name of this sound card. | ||
| The default value is "PDMIC". | ||
| - atmel,mic-offset | ||
| The offset that should be added. | ||
| The range is from -32768 to 32767. | ||
| The default value is 0. | ||
|
|
||
| Example: | ||
| pdmic@f8018000 { | ||
| compatible = "atmel,sama5d2-pdmic"; | ||
| reg = <0xf8018000 0x124>; | ||
| interrupts = <48 IRQ_TYPE_LEVEL_HIGH 7>; | ||
| dmas = <&dma0 | ||
| (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | ||
| | AT91_XDMAC_DT_PERID(50))>; | ||
| dma-names = "rx"; | ||
| clocks = <&pdmic_clk>, <&pdmic_gclk>; | ||
| clock-names = "pclk", "gclk"; | ||
|
|
||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_pdmic_default>; | ||
| atmel,model = "PDMIC @ sama5d2_xplained"; | ||
| atmel,mic-min-freq = <1000000>; | ||
| atmel,mic-max-freq = <3246000>; | ||
| atmel,mic-offset = <0x0>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| Dialog Semiconductor DA7218 Audio Codec bindings | ||
|
|
||
| DA7218 is an audio codec with HP detect feature. | ||
|
|
||
| ====== | ||
|
|
||
| Required properties: | ||
| - compatible : Should be "dlg,da7217" or "dlg,da7218" | ||
| - reg: Specifies the I2C slave address | ||
|
|
||
| - VDD-supply: VDD power supply for the device | ||
| - VDDMIC-supply: VDDMIC power supply for the device | ||
| - VDDIO-supply: VDDIO power supply for the device | ||
| (See Documentation/devicetree/bindings/regulator/regulator.txt for further | ||
| information relating to regulators) | ||
|
|
||
| Optional properties: | ||
| - interrupt-parent: Specifies the phandle of the interrupt controller to which | ||
| the IRQs from DA7218 are delivered to. | ||
| - interrupts: IRQ line info for DA7218 chip. | ||
| (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for | ||
| further information relating to interrupt properties) | ||
| - interrupt-names : Name associated with interrupt line. Should be "wakeup" if | ||
| interrupt is to be used to wake system, otherwise "irq" should be used. | ||
| - wakeup-source: Flag to indicate this device can wake system (suspend/resume). | ||
|
|
||
| - clocks : phandle and clock specifier for codec MCLK. | ||
| - clock-names : Clock name string for 'clocks' attribute, should be "mclk". | ||
|
|
||
| - dlg,micbias1-lvl-millivolt : Voltage (mV) for Mic Bias 1 | ||
| [<1200>, <1600>, <1800>, <2000>, <2200>, <2400>, <2600>, <2800>, <3000>] | ||
| - dlg,micbias2-lvl-millivolt : Voltage (mV) for Mic Bias 2 | ||
| [<1200>, <1600>, <1800>, <2000>, <2200>, <2400>, <2600>, <2800>, <3000>] | ||
| - dlg,mic1-amp-in-sel : Mic1 input source type | ||
| ["diff", "se_p", "se_n"] | ||
| - dlg,mic2-amp-in-sel : Mic2 input source type | ||
| ["diff", "se_p", "se_n"] | ||
| - dlg,dmic1-data-sel : DMIC1 channel select based on clock edge. | ||
| ["lrise_rfall", "lfall_rrise"] | ||
| - dlg,dmic1-samplephase : When to sample audio from DMIC1. | ||
| ["on_clkedge", "between_clkedge"] | ||
| - dlg,dmic1-clkrate-hz : DMic1 clock frequency (Hz). | ||
| [<1500000>, <3000000>] | ||
| - dlg,dmic2-data-sel : DMic2 channel select based on clock edge. | ||
| ["lrise_rfall", "lfall_rrise"] | ||
| - dlg,dmic2-samplephase : When to sample audio from DMic2. | ||
| ["on_clkedge", "between_clkedge"] | ||
| - dlg,dmic2-clkrate-hz : DMic2 clock frequency (Hz). | ||
| [<1500000>, <3000000>] | ||
| - dlg,hp-diff-single-supply : Boolean flag, use single supply for HP | ||
| (DA7217 only) | ||
|
|
||
| ====== | ||
|
|
||
| Optional Child node - 'da7218_hpldet' (DA7218 only): | ||
|
|
||
| Optional properties: | ||
| - dlg,jack-rate-us : Time between jack detect measurements (us) | ||
| [<5>, <10>, <20>, <40>, <80>, <160>, <320>, <640>] | ||
| - dlg,jack-debounce : Number of debounce measurements taken for jack detect | ||
| [<0>, <2>, <3>, <4>] | ||
| - dlg,jack-threshold-pct : Threshold level for jack detection (% of VDD) | ||
| [<84>, <88>, <92>, <96>] | ||
| - dlg,comp-inv : Boolean flag, invert comparator output | ||
| - dlg,hyst : Boolean flag, enable hysteresis | ||
| - dlg,discharge : Boolean flag, auto discharge of Mic Bias on jack removal | ||
|
|
||
| ====== | ||
|
|
||
| Example: | ||
|
|
||
| codec: da7218@1a { | ||
| compatible = "dlg,da7218"; | ||
| reg = <0x1a>; | ||
| interrupt-parent = <&gpio6>; | ||
| interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; | ||
| wakeup-source; | ||
|
|
||
| VDD-supply = <®_audio>; | ||
| VDDMIC-supply = <®_audio>; | ||
| VDDIO-supply = <®_audio>; | ||
|
|
||
| clocks = <&clks 201>; | ||
| clock-names = "mclk"; | ||
|
|
||
| dlg,micbias1-lvl-millivolt = <2600>; | ||
| dlg,micbias2-lvl-millivolt = <2600>; | ||
| dlg,mic1-amp-in-sel = "diff"; | ||
| dlg,mic2-amp-in-sel = "diff"; | ||
|
|
||
| dlg,dmic1-data-sel = "lrise_rfall"; | ||
| dlg,dmic1-samplephase = "on_clkedge"; | ||
| dlg,dmic1-clkrate-hz = <3000000>; | ||
| dlg,dmic2-data-sel = "lrise_rfall"; | ||
| dlg,dmic2-samplephase = "on_clkedge"; | ||
| dlg,dmic2-clkrate-hz = <3000000>; | ||
|
|
||
| da7218_hpldet { | ||
| dlg,jack-rate-us = <40>; | ||
| dlg,jack-debounce = <2>; | ||
| dlg,jack-threshold-pct = <84>; | ||
| dlg,hyst; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| Imagination Technologies I2S Input Controller | ||
|
|
||
| Required Properties: | ||
|
|
||
| - compatible : Compatible list, must contain "img,i2s-in" | ||
|
|
||
| - #sound-dai-cells : Must be equal to 0 | ||
|
|
||
| - reg : Offset and length of the register set for the device | ||
|
|
||
| - clocks : Contains an entry for each entry in clock-names | ||
|
|
||
| - clock-names : Must include the following entry: | ||
| "sys" The system clock | ||
|
|
||
| - dmas: Contains an entry for each entry in dma-names. | ||
|
|
||
| - dma-names: Must include the following entry: | ||
| "rx" Single DMA channel used by all active I2S channels | ||
|
|
||
| - img,i2s-channels : Number of I2S channels instantiated in the I2S in block | ||
|
|
||
| Optional Properties: | ||
|
|
||
| - interrupts : Contains the I2S in interrupts. Depending on | ||
| the configuration, there may be no interrupts, one interrupt, | ||
| or an interrupt per I2S channel. For the case where there is | ||
| one interrupt per channel, the interrupts should be listed | ||
| in ascending channel order | ||
|
|
||
| - resets: Contains a phandle to the I2S in reset signal | ||
|
|
||
| - reset-names: Contains the reset signal name "rst" | ||
|
|
||
| Example: | ||
|
|
||
| i2s_in: i2s-in@18100800 { | ||
| compatible = "img,i2s-in"; | ||
| reg = <0x18100800 0x200>; | ||
| interrupts = <GIC_SHARED 7 IRQ_TYPE_LEVEL_HIGH>; | ||
| dmas = <&mdc 30 0xffffffff 0>; | ||
| dma-names = "rx"; | ||
| clocks = <&cr_periph SYS_CLK_I2S_IN>; | ||
| clock-names = "sys"; | ||
| img,i2s-channels = <6>; | ||
| #sound-dai-cells = <0>; | ||
| }; |
Oops, something went wrong.