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

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

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

ASoC: Updates for v4.6

The main thing in terms of the core this time around has been some
additional framework work for dynamic topologies (though we *still*
don't appear to have a stable ABI for the topology code, it's probably
worth considering if this will ever happen...).  Otherwise the work has
almost all been in the drivers:

 - HDMI support for Sky Lake, along with other fixes and enhancements
   for the Intel drivers.
 - Lots of improvements to the Renesas drivers.
 - Capture support for Qualcomm drivers.
 - Support for TI DaVinci DRA7xxx devices.
 - New machine drivers for Freescale systems with Cirrus CODECs,
   Mediatek systems with RT5650 CODECs.
 - New CPU drivers for Allwinner S/PDIF controllers
 - New CODEC drivers for Maxim MAX9867 and MAX98926 and Realtek RT5514.
parents 028cb68e d4a6360f

Documentation/DocBook/media/v4l/media-types.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -56,10 +56,6 @@ 
	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry>Connector for a RGB composite signal.</entry>

	    <entry>Connector for a RGB composite signal.</entry>

	  </row>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>

	    <entry>Connector for a test generator.</entry>

	  </row>

	  <row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry>Camera video sensor entity.</entry>

	    <entry>Camera video sensor entity.</entry>

Documentation/devicetree/bindings/regmap/regmap.txt

+7 −4
Original line number Original line Diff line number Diff line
@@ -5,15 +5,18 @@ Index Device Endianness properties 
---------------------------------------------------

---------------------------------------------------

1         BE         'big-endian'

1         BE         'big-endian'

2         LE         'little-endian'

2         LE         'little-endian'

3	  Native     'native-endian'





For one device driver, which will run in different scenarios above

For one device driver, which will run in different scenarios above

on different SoCs using the devicetree, we need one way to simplify

on different SoCs using the devicetree, we need one way to simplify

this.

this.





Required properties:

Optional properties:

- {big,little}-endian: these are boolean properties, if absent

- {big,little,native}-endian: these are boolean properties, if absent

  meaning that the CPU and the Device are in the same endianness mode,

  then the implementation will choose a default based on the device

  these properties are for register values and all the buffers only.

  being controlled.  These properties are for register values and all

  the buffers only.  Native endian means that the CPU and device have

  the same endianness.





Examples:

Examples:

Scenario 1 : CPU in LE mode & device in LE mode.

Scenario 1 : CPU in LE mode & device in LE mode.

Documentation/devicetree/bindings/sound/adi,adau17x1.txt

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781



Required properties:



 - compatible:		Should contain one of the following:

			"adi,adau1361"

			"adi,adau1461"

			"adi,adau1761"

			"adi,adau1961"

			"adi,adau1381"

			"adi,adau1781"



 - reg:			The i2c address. Value depends on the state of ADDR0

			and ADDR1, as wired in hardware.



Examples:

#include <dt-bindings/sound/adau17x1.h>



	i2c_bus {

		adau1361@38 {

			compatible = "adi,adau1761";

			reg = <0x38>;

		};

	};

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,9 @@ The compatible list for this generic sound card currently: 




 "fsl,imx-audio-cs42888"

 "fsl,imx-audio-cs42888"





 "fsl,imx-audio-cs427x"

 (compatible with CS4271 and CS4272)



 "fsl,imx-audio-wm8962"

 "fsl,imx-audio-wm8962"

 (compatible with Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt)

 (compatible with Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt)
@@ -63,6 +66,12 @@ Optional properties: 
  - audio-asrc		: The phandle of ASRC. It can be absent if there's no

  - audio-asrc		: The phandle of ASRC. It can be absent if there's no

			  need to add ASRC support via DPCM.

			  need to add ASRC support via DPCM.





Optional unless SSI is selected as a CPU DAI:



  - mux-int-port	: The internal port of the i.MX audio muxer (AUDMUX)



  - mux-ext-port	: The external port of the i.MX audio muxer



Example:

Example:

sound-cs42888 {

sound-cs42888 {

	compatible = "fsl,imx-audio-cs42888";

	compatible = "fsl,imx-audio-cs42888";

Documentation/devicetree/bindings/sound/max9867.txt

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
max9867 codec



This device supports I2C mode only.



Required properties:



- compatible : "maxim,max9867"

- reg : The chip select number on the I2C bus



Example:



&i2c {

	max9867: max9867@0x18 {

		compatible = "maxim,max9867";

		reg = <0x18>;

	};

};