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

Commit 152fce5a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

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

ASoC: Updates for v4.10

There's been a few bits of framework work this time around and quite a
lot of cleanups and improvements to existing code:

 - Support for stereo DAPM controls from Chen-yu Tsai.
 - Some initial work on the of-graph sound card from Morimoto-san, the
   main bulk of this is currently in binding review.
 - Lots of Renesas cleanups from Morimoto-san and sunxi work from
   Chen-yu Tsai.
 - regmap conversions of the remaining AC'97 drivers from Lars-Peter
   Clausen.
 - A new version of the topology ABI from Mengdong Lin.
 - New drivers for Cirrus Logic CS42L42, Qualcomm MSM8916-WCD, and Realtek
   RT5665.
parents d71bb23a a5de5b74

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
			Linus

----------



M: Matt Mackal

N: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator
@@ -1910,7 +1910,7 @@ S: Ra'annana, Israel 


N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

W: http://www.halobates.de

D: network, x86, NUMA, various hacks

S: Schwalbenstr. 96

S: 85551 Ottobrunn
@@ -2089,8 +2089,8 @@ D: ST Microelectronics SPEAr13xx PCI host bridge driver 
D: Synopsys Designware PCI host bridge driver



N: Gabor Kuti

M: seasons@falcon.sch.bme.hu

M: seasons@makosteszta.sote.hu

E: seasons@falcon.sch.bme.hu

E: seasons@makosteszta.sote.hu

D: Original author of software suspend



N: Jaroslav Kysela

Documentation/ABI/testing/sysfs-devices-system-ibm-rtl

+2 −2
Original line number Diff line number Diff line 
What:           state

What:           /sys/devices/system/ibm_rtl/state

Date:           Sep 2010

KernelVersion:  2.6.37

Contact:        Vernon Mauery <vernux@us.ibm.com>
@@ -10,7 +10,7 @@ Description: The state file allows a means by which to change in and 
Users:          The ibm-prtm userspace daemon uses this interface.





What:           version

What:           /sys/devices/system/ibm_rtl/version

Date:           Sep 2010

KernelVersion:  2.6.37

Contact:        Vernon Mauery <vernux@us.ibm.com>

Documentation/ABI/testing/sysfs-platform-sst-atom

0 → 100644
+17 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/8086%x:00/firmware_version

Date:		November 2016

KernelVersion:	4.10

Contact:	"Sebastien Guiriec" <sebastien.guiriec@intel.com>

Description:

		LPE Firmware version for SST driver on all atom

		plaforms (BYT/CHT/Merrifield/BSW).

		If the FW has never been loaded it will display:

			"FW not yet loaded"

		If FW has been loaded it will display:

			"v01.aa.bb.cc"

		aa: Major version is reflecting SoC version:

			0d: BYT FW

			0b: BSW FW

			07: Merrifield FW

		bb: Minor version

		cc: Build version

Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt→Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ perform in-band IPMI communication with their host. 


Required properties:



- compatible : should be "aspeed,ast2400-bt-bmc"

- compatible : should be "aspeed,ast2400-ibt-bmc"

- reg: physical address and size of the registers



Optional properties:
@@ -17,7 +17,7 @@ Optional properties: 
Example:



	ibt@1e789140 {

		compatible = "aspeed,ast2400-bt-bmc";

		compatible = "aspeed,ast2400-ibt-bmc";

		reg = <0x1e789140 0x18>;

		interrupts = <8>;

	};

Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ Optional properties: 
  reset signal present internally in some host controller IC designs.

  See Documentation/devicetree/bindings/reset/reset.txt for details.



* reset-names: request name for using "resets" property. Must be "reset".

	(It will be used together with "resets" property.)



* clocks: from common clock binding: handle to biu and ciu clocks for the

  bus interface unit clock and the card interface unit clock.
@@ -103,6 +106,8 @@ board specific portions as listed below. 
		interrupts = <0 75 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		resets = <&rst 20>;

		reset-names = "reset";

	};



[board specific internal DMA resources]