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

Commit b06898d1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v4.14' of... 

Merge tag 'asoc-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v4.14

This is quite a large release by volume of patches and diff, a lot of
that is mechanical cleanup patches but it's great to also see a range of
vendors actively working on adding new features and fixing issues in
their drivers.  Intel and Realtek have been especially active here.

 - Continued work towards moving everything to the component model from
   Morimoto-san.
 - Use of devres for jack detection GPIOs, eliminating some potential
   resource leaks.
 - Jack detection support for Qualcomm MSM8916.
 - Support for Allwinner H3, Cirrus Logic CS43130, Intel Kabylake
   systems with RT5663, Realtek RT274, TI TLV320AIC32x6 and Wolfson
   WM8523.
parents b24a5f29 f5fd4a67

Documentation/admin-guide/pm/cpufreq.rst

+8 −0
Original line number Diff line number Diff line
@@ -237,6 +237,14 @@ are the following: 
	This attribute is not present if the scaling driver in use does not

	support it.



``cpuinfo_cur_freq``

	Current frequency of the CPUs belonging to this policy as obtained from

	the hardware (in KHz).



	This is expected to be the frequency the hardware actually runs at.

	If that frequency cannot be determined, this attribute should not

	be present.



``cpuinfo_max_freq``

	Maximum possible operating frequency the CPUs belonging to this policy

	can run at (in kHz).

Documentation/devicetree/bindings/ata/sata_rcar.txt

+11 −3
Original line number Diff line number Diff line 
* Renesas R-Car SATA



Required properties:

- compatible		: should contain one of the following:

- compatible		: should contain one or more of the following:

			  - "renesas,sata-r8a7779" for R-Car H1

			    ("renesas,rcar-sata" is deprecated)

			  - "renesas,sata-r8a7790-es1" for R-Car H2 ES1

			  - "renesas,sata-r8a7790" for R-Car H2 other than ES1

			  - "renesas,sata-r8a7791" for R-Car M2-W

			  - "renesas,sata-r8a7793" for R-Car M2-N

			  - "renesas,sata-r8a7795" for R-Car H3

			  - "renesas,rcar-gen2-sata" for a generic R-Car Gen2 compatible device

			  - "renesas,rcar-gen3-sata" for a generic R-Car Gen3 compatible device

			  - "renesas,rcar-sata" is deprecated



			  When compatible with the generic version nodes

			  must list the SoC-specific version corresponding

			  to the platform first followed by the generic

			  version.



- reg			: address and length of the SATA registers;

- interrupts		: must consist of one interrupt specifier.

- clocks		: must contain a reference to the functional clock.
@@ -16,7 +24,7 @@ Required properties: 
Example:



sata0: sata@ee300000 {

	compatible = "renesas,sata-r8a7791";

	compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";

	reg = <0 0xee300000 0 0x2000>;

	interrupt-parent = <&gic>;

	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/gpio/gpio-exar.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
Exportable MPIO interface of Exar UART chips



Required properties of the device:

 - exar,first-pin: first exportable pins (0..15)

 - ngpios: number of exportable pins (1..16)

Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Optional properties: 
Example for a Mali-T760:



gpu@ffa30000 {

	compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";

	compatible = "rockchip,rk3288-mali", "arm,mali-t760";

	reg = <0xffa30000 0x10000>;

	interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

		     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

Documentation/devicetree/bindings/sound/cs43130.txt

0 → 100644
+67 −0
Original line number Diff line number Diff line 
CS43130 DAC



Required properties:



  - compatible : "cirrus,cs43130", "cirrus,cs4399", "cirrus,cs43131",

                 "cirrus,cs43198"



  - reg : the I2C address of the device for I2C



  - VA-supply, VP-supply, VL-supply, VCP-supply, VD-supply:

	power supplies for the device, as covered in

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





Optional properties:



  - reset-gpios : Active low GPIO used to reset the device



  - cirrus,xtal-ibias:

   When external MCLK is generated by external crystal

   oscillator, CS43130 can be used to provide bias current

   for external crystal.  Amount of bias current sent is

   set as:

   1 = 7.5uA

   2 = 12.5uA

   3 = 15uA



  - cirrus,dc-measure:

   Boolean, define to enable headphone DC impedance measurement.



  - cirrus,ac-measure:

   Boolean, define to enable headphone AC impedance measurement.

   DC impedance must also be enabled for AC impedance measurement.



  - cirrus,dc-threshold:

   Define 2 DC impedance thresholds in ohms for HP output control.

   Default values are 50 and 120 Ohms.



  - cirrus,ac-freq:

   Define the frequencies at which to measure HP AC impedance.

   Only used if "cirrus,dc-measure" is defined.

   Exactly 10 frequencies must be defined.

   If this properties is undefined, by default,

   following frequencies are used:

   <24 43 93 200 431 928 2000 4309 9283 20000>

   The above frequencies are logarithmically equally spaced.

   Log base is 10.



Example:



cs43130: audio-codec@30 {

   compatible = "cirrus,cs43130";

   reg = <0x30>;

   reset-gpios = <&axi_gpio 54 0>;

   VA-supply = <&dummy_vreg>;

   VP-supply = <&dummy_vreg>;

   VL-supply = <&dummy_vreg>;

   VCP-supply = <&dummy_vreg>;

   VD-supply = <&dummy_vreg>;

   cirrus,xtal-ibias = <2>;

   interrupt-parent = <&gpio0>;

   interrupts = <55 8>;

   cirrus,dc-measure;

   cirrus,ac-measure;

   cirrus,dc-threshold = /bits/ 16 <20 100>;

   cirrus,ac-freq = /bits/ 16 <24 43 93 200 431 928 2000 4309 9283 20000>;

};