Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 221656e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound updates from Takashi Iwai:
 "It was a relatively calm development cycle, and no scaring changes are
  seen in both core and driver sides. Here are some highlights:

  ASoC:
   - A new API for hooking up jacks more generically and easily

   - Card longname is set based on DMI for a unique UCM profile

   - Lots of Intel driver fixes: Atom, Broxton, Skylake and newer chips

   - New drivers for Cirrus CS35L35, DIO DIO2125, Everest ES7132,
     HiSilicon hi6210, Maxim MAX98927, MT2701 systems with WM8960,
     Nuvoton NAU8824, Odroid systems, ST STM32 SAI controllers and x86
     systems with DA7213

  HD-audio:
   - Many new quirks to support headset for various devices (mostly ASUS
     ones) as usual

   - Support for dual codecs on some Gigabyte mobos and Lenovo laptop

   - Improvement on PCM position reporting for Skylake and newer

  FireWire:
   - New drivers for MOTU and RME Fireface series

   - Updates for Digidesign Digi00x and TASCAM series

   - Support for tracepoints

  Others:
   - USB-audio: improved support for quirk_alias option

   - Cleanups, constification allover the places"

* tag 'sound-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (299 commits)
  ASoC: codec: wm8960: Relax bit clock computation when using PLL
  ASoC: codec: wm9860: avoid maybe-uninitialized warning
  ASoC: nau8824: leave Class D gain at chip default
  ASoC: nau8824: rename controls to match DAPM controls
  ASoC: Intel: Skylake: Return negative error code
  ASoC: Intel: Skylake: Fix unused variable warning
  ASoC: Intel: Skylake: fix uninitialized pointer use
  ASoC: sti: Fix error handling if of_clk_get() fails
  ASoC: cs4271: configure reset GPIO as output
  ASoC: dwc: Disallow building designware_pcm as a module
  ALSA: ali5451: fix spelling mistake in "ali_capture_preapre"
  ASoC: stm32: add SAI driver
  ASoC: stm32: add bindings for SAI
  ASoC: Intel: Skylake: Add loadable module support on KBL platform
  ASoC: Intel: Skylake: Modify load_lib_ipc arguments for a nowait version
  ASoC: Intel: Skylake: Register dsp_fw_ops for kabylake
  ASoC: Intel: Skylake: Modify arguments to reuse module transfer function
  ASoC: Intel: Skylake: Commonize library load
  ASoC: Intel: Skylake: Move sst common initialization to a helper function
  ASoC: nau8824: new driver
  ...
parents 2f34c123 a5c3b32a

Documentation/devicetree/bindings/sound/cs35l35.txt

0 → 100644
+180 −0
Original line number Diff line number Diff line 
CS35L35 Boosted Speaker Amplifier



Required properties:



  - compatible : "cirrus,cs35l35"



  - reg : the I2C address of the device for I2C



  - VA-supply, VP-supply : power supplies for the device,

    as covered in

    Documentation/devicetree/bindings/regulator/regulator.txt.



  - interrupt-parent : Specifies the phandle of the interrupt controller to

    which the IRQs from CS35L35 are delivered to.

  - interrupts : IRQ line info CS35L35.

    (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

    for further information relating to interrupt properties)



Optional properties:

  - reset-gpios : gpio used to reset the amplifier



  - cirrus,stereo-config : Boolean to determine if there are 2 AMPs for a

  Stereo configuration



  - cirrus,audio-channel : Set Location of Audio Signal on Serial Port

  0 = Data Packet received on Left I2S Channel

  1 = Data Packet received on Right I2S Channel



  - cirrus,advisory-channel : Set Location of Advisory Signal on Serial Port

  0 = Data Packet received on Left I2S Channel

  1 = Data Packet received on Right I2S Channel



  - cirrus,shared-boost : Boolean to enable ClassH tracking of Advisory Signal

  if 2 Devices share Boost BST_CTL



  - cirrus,external-boost : Boolean to specify the device is using an external

  boost supply, note that sharing a boost from another cs35l35 would constitute

  using an external supply for the slave device



  - cirrus,sp-drv-strength : Value for setting the Serial Port drive strength

  Table 3-10 of the datasheet lists drive-strength specifications

  0 = 1x (Default)

  1 = .5x

  - cirrus,sp-drv-unused : Determines how unused slots should be driven on the

  Serial Port.

  0 - Hi-Z

  2 - Drive 0's (Default)

  3 - Drive 1's



  - cirrus,bst-pdn-fet-on : Boolean to determine if the Boost PDN control

  powers down with a rectification FET On or Off. If VSPK is supplied

  externally then FET is off.



  - cirrus,boost-ctl-millivolt : Boost Voltage Value.  Configures the boost

    converter's output voltage in mV. The range is from 2600mV to 9000mV with

    increments of 100mV.

    (Default) VP



  - cirrus,boost-peak-milliamp : Boost-converter peak current limit in mA.

  Configures the peak current by monitoring the current through the boost FET.

  Range starts at 1680mA and goes to a maximum of 4480mA with increments of

  110mA.

  (Default) 2.46 Amps



  - cirrus,amp-gain-zc : Boolean to determine if to use Amplifier gain-change

  zero-cross



Optional H/G Algorithm sub-node:



  The cs35l35 node can have a single "cirrus,classh-internal-algo" sub-node

  that will disable automatic control of the internal H/G Algorithm.



  It is strongly recommended that the Datasheet be referenced when adjusting

  or using these Class H Algorithm controls over the internal Algorithm.

  Serious damage can occur to the Device and surrounding components.



  - cirrus,classh-internal-algo : Sub-node for the Internal Class H Algorithm

  See Section 4.3 Internal Class H Algorithm in the Datasheet.

  If not used, the device manages the ClassH Algorithm internally.



Optional properties for the "cirrus,classh-internal-algo" Sub-node



  Section 7.29 Class H Control

  - cirrus,classh-bst-overide : Boolean

  - cirrus,classh-bst-max-limit

  - cirrus,classh-mem-depth



  Section 7.30 Class H Headroom Control

  - cirrus,classh-headroom



  Section 7.31 Class H Release Rate

  - cirrus,classh-release-rate



  Section 7.32 Class H Weak FET Drive Control

  - cirrus,classh-wk-fet-disable

  - cirrus,classh-wk-fet-delay

  - cirrus,classh-wk-fet-thld



  Section 7.34 Class H VP Control

  - cirrus,classh-vpch-auto

  - cirrus,classh-vpch-rate

  - cirrus,classh-vpch-man



Optional Monitor Signal Format sub-node:



  The cs35l35 node can have a single "cirrus,monitor-signal-format" sub-node

  for adjusting the Depth, Location and Frame of the Monitoring Signals

  for Algorithms.



  See Sections 4.8.2 through 4.8.4 Serial-Port Control in the Datasheet



  -cirrus,monitor-signal-format : Sub-node for the Monitor Signaling Formating

  on the I2S Port. Each of the 3 8 bit values in the array contain the settings

  for depth, location, and frame.



  If not used, the defaults for the 6 monitor signals is used.



  Sections 7.44 - 7.53 lists values for the depth, location, and frame

  for each monitoring signal.



  - cirrus,imon : 4 8 bit values to set the depth, location, frame and ADC

  scale of the IMON monitor signal.



  - cirrus,vmon : 3 8 bit values to set the depth, location, and frame

  of the VMON monitor signal.



  - cirrus,vpmon : 3 8 bit values to set the depth, location, and frame

  of the VPMON monitor signal.



  - cirrus,vbstmon : 3 8 bit values to set the depth, location, and frame

  of the VBSTMON monitor signal



  - cirrus,vpbrstat : 3 8 bit values to set the depth, location, and frame

  of the VPBRSTAT monitor signal



  - cirrus,zerofill : 3 8 bit values to set the depth, location, and frame\

  of the ZEROFILL packet in the monitor signal



Example:



cs35l35: cs35l35@20 {

	compatible = "cirrus,cs35l35";

	reg = <0x20>;

	VA-supply = <&dummy_vreg>;

	VP-supply = <&dummy_vreg>;

	reset-gpios = <&axi_gpio 54 0>;

	interrupt-parent = <&gpio8>;

	interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

	cirrus,boost-ctl-millivolt = <9000>;



	cirrus,stereo-config;

	cirrus,audio-channel = <0x00>;

	cirrus,advisory-channel = <0x01>;

	cirrus,shared-boost;



	cirrus,classh-internal-algo {

		cirrus,classh-bst-overide;

		cirrus,classh-bst-max-limit = <0x01>;

		cirrus,classh-mem-depth = <0x01>;

		cirrus,classh-release-rate = <0x08>;

		cirrus,classh-headroom-millivolt = <0x0B>;

		cirrus,classh-wk-fet-disable = <0x01>;

		cirrus,classh-wk-fet-delay = <0x04>;

		cirrus,classh-wk-fet-thld = <0x01>;

		cirrus,classh-vpch-auto = <0x01>;

		cirrus,classh-vpch-rate = <0x02>;

		cirrus,classh-vpch-man = <0x05>;

	};



	/* Depth, Location, Frame */

	cirrus,monitor-signal-format {

		cirrus,imon = /bits/ 8 <0x03 0x00 0x01>;

		cirrus,vmon = /bits/ 8 <0x03 0x00 0x00>;

		cirrus,vpmon = /bits/ 8 <0x03 0x04 0x00>;

		cirrus,vbstmon = /bits/ 8 <0x03 0x04 0x01>;

		cirrus,vpbrstat = /bits/ 8 <0x00 0x04 0x00>;

		cirrus,zerofill = /bits/ 8 <0x00 0x00 0x00>;

	};



};

Documentation/devicetree/bindings/sound/dioo,dio2125.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
DIO2125 Audio Driver



Required properties:

- compatible : "dioo,dio2125"

- enable-gpios : the gpio connected to the enable pin of the dio2125



Example:



amp: analog-amplifier {

	compatible = "dioo,dio2125";

	enable-gpios = <&gpio GPIOH_3 0>;

};

Documentation/devicetree/bindings/sound/everest,es7134.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
ES7134 i2s DA converter



Required properties:

- compatible : "everest,es7134" or "everest,es7144"



Example:



i2s_codec: external-codec {

	compatible = "everest,es7134";

};

Documentation/devicetree/bindings/sound/fsl,ssi.txt

+18 −16
Original line number Diff line number Diff line
@@ -20,24 +20,8 @@ Required properties: 
                    have.

- interrupt-parent: The phandle for the interrupt controller that

                    services interrupts for this device.

- fsl,playback-dma: Phandle to a node for the DMA channel to use for

                    playback of audio.  This is typically dictated by SOC

                    design.  See the notes below.

- fsl,capture-dma:  Phandle to a node for the DMA channel to use for

                    capture (recording) of audio.  This is typically dictated

                    by SOC design.  See the notes below.

- fsl,fifo-depth:   The number of elements in the transmit and receive FIFOs.

                    This number is the maximum allowed value for SFCSR[TFWM0].

- fsl,ssi-asynchronous:

                    If specified, the SSI is to be programmed in asynchronous

                    mode.  In this mode, pins SRCK, STCK, SRFS, and STFS must

                    all be connected to valid signals.  In synchronous mode,

                    SRCK and SRFS are ignored.  Asynchronous mode allows

                    playback and capture to use different sample sizes and

                    sample rates.  Some drivers may require that SRCK and STCK

                    be connected together, and SRFS and STFS be connected

                    together.  This would still allow different sample sizes,

                    but not different sample rates.

 - clocks:          "ipg" - Required clock for the SSI unit

                    "baud" - Required clock for SSI master mode. Otherwise this

		      clock is not used
@@ -61,6 +45,24 @@ Optional properties: 
- fsl,mode:         The operating mode for the AC97 interface only.

                    "ac97-slave" - AC97 mode, SSI is clock slave

                    "ac97-master" - AC97 mode, SSI is clock master

- fsl,ssi-asynchronous:

                    If specified, the SSI is to be programmed in asynchronous

                    mode.  In this mode, pins SRCK, STCK, SRFS, and STFS must

                    all be connected to valid signals.  In synchronous mode,

                    SRCK and SRFS are ignored.  Asynchronous mode allows

                    playback and capture to use different sample sizes and

                    sample rates.  Some drivers may require that SRCK and STCK

                    be connected together, and SRFS and STFS be connected

                    together.  This would still allow different sample sizes,

                    but not different sample rates.

- fsl,playback-dma: Phandle to a node for the DMA channel to use for

                    playback of audio.  This is typically dictated by SOC

                    design.  See the notes below.

                    Only used on Power Architecture.

- fsl,capture-dma:  Phandle to a node for the DMA channel to use for

                    capture (recording) of audio.  This is typically dictated

                    by SOC design.  See the notes below.

                    Only used on Power Architecture.



Child 'codec' node required properties:

- compatible:       Compatible list, contains the name of the codec

Documentation/devicetree/bindings/sound/hisilicon,hi6210-i2s.txt

0 → 100644
+42 −0
Original line number Diff line number Diff line 
* Hisilicon 6210 i2s controller



Required properties:



- compatible: should be one of the following:

   - "hisilicon,hi6210-i2s"

- reg: physical base address of the i2s controller unit and length of

   memory mapped region.

- interrupts: should contain the i2s interrupt.

- clocks: a list of phandle + clock-specifier pairs, one for each entry

  in clock-names.

- clock-names: should contain following:

   - "dacodec"

   - "i2s-base"

- dmas: DMA specifiers for tx dma. See the DMA client binding,

  Documentation/devicetree/bindings/dma/dma.txt

- dma-names: should be "tx" and "rx"

- hisilicon,sysctrl-syscon: phandle to sysctrl syscon

- #sound-dai-cells: Should be set to 1 (for multi-dai)

   - The dai cell indexes reference the following interfaces:

       0: S2 interface

       (Currently that is the only one available, but more may be

        supported in the future)



Example for the hi6210 i2s controller:



i2s0: i2s@f7118000{

	compatible = "hisilicon,hi6210-i2s";

	reg = <0x0 0xf7118000 0x0 0x8000>; /* i2s unit */

	interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; /* 155 "DigACodec_intr"-32 */

	clocks = <&sys_ctrl HI6220_DACODEC_PCLK>,

		 <&sys_ctrl HI6220_BBPPLL0_DIV>;

	clock-names = "dacodec", "i2s-base";

	dmas = <&dma0 15 &dma0 14>;

	dma-names = "rx", "tx";

	hisilicon,sysctrl-syscon = <&sys_ctrl>;

	#sound-dai-cells = <1>;

};



Then when referencing the i2s controller:

	sound-dai = <&i2s0 0>; /* index 0 => S2 interface */