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

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

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

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

ASoC: Fixes for v4.14

A bunch of fixes here, mostly device specific ones (the biggest one
being the revert of the hotword support for rt5514), with a couple of
core fixes for potential issues with corrupted or otherwise invalid
topology files.
parents 1f20f9ff b817d936

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+8 −0
Original line number Original line Diff line number Diff line
@@ -14,3 +14,11 @@ Description: 
		Show or set the gain boost of the amp, from 0-31 range.

		Show or set the gain boost of the amp, from 0-31 range.

		18 = indoors (default)

		18 = indoors (default)

		14 = outdoors

		14 = outdoors



What		/sys/bus/iio/devices/iio:deviceX/noise_level_tripped

Date:		May 2017

KernelVersion:	4.13

Contact:	Matt Ranostay <matt.ranostay@konsulko.com>

Description:

		When 1 the noise level is over the trip level and not reporting

		valid data

Documentation/ABI/testing/sysfs-devices-power

+3 −1
Original line number Original line Diff line number Diff line
@@ -211,7 +211,9 @@ Description: 
		device, after it has been suspended at run time, from a resume

		device, after it has been suspended at run time, from a resume

		request to the moment the device will be ready to process I/O,

		request to the moment the device will be ready to process I/O,

		in microseconds.  If it is equal to 0, however, this means that

		in microseconds.  If it is equal to 0, however, this means that

		the PM QoS resume latency may be arbitrary.

		the PM QoS resume latency may be arbitrary and the special value

		"n/a" means that user space cannot accept any resume latency at

		all for the given device.





		Not all drivers support this attribute.  If it isn't supported,

		Not all drivers support this attribute.  If it isn't supported,

		it is not present.

		it is not present.

Documentation/ABI/testing/sysfs-kernel-mm-swap

+0 −10
Original line number Original line Diff line number Diff line
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead. 
		still used for tmpfs etc. other users.  If set to

		still used for tmpfs etc. other users.  If set to

		false, the global swap readahead algorithm will be

		false, the global swap readahead algorithm will be

		used for all swappable pages.
 
		used for all swappable pages.
 


What:		/sys/kernel/mm/swap/vma_ra_max_order

Date:		August 2017

Contact:	Linux memory management mailing list <linux-mm@kvack.org>

Description:	The max readahead size in order for VMA based swap readahead



		VMA based swap readahead algorithm will readahead at

		most 1 << max_order pages for each readahead.  The

		real readahead size for each readahead will be scaled

		according to the estimation algorithm.

Documentation/core-api/kernel-api.rst

+0 −14
Original line number Original line Diff line number Diff line
@@ -352,44 +352,30 @@ Read-Copy Update (RCU) 
----------------------

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





.. kernel-doc:: include/linux/rcupdate.h

.. kernel-doc:: include/linux/rcupdate.h

   :external:





.. kernel-doc:: include/linux/rcupdate_wait.h

.. kernel-doc:: include/linux/rcupdate_wait.h

   :external:





.. kernel-doc:: include/linux/rcutree.h

.. kernel-doc:: include/linux/rcutree.h

   :external:





.. kernel-doc:: kernel/rcu/tree.c

.. kernel-doc:: kernel/rcu/tree.c

   :external:





.. kernel-doc:: kernel/rcu/tree_plugin.h

.. kernel-doc:: kernel/rcu/tree_plugin.h

   :external:





.. kernel-doc:: kernel/rcu/tree_exp.h

.. kernel-doc:: kernel/rcu/tree_exp.h

   :external:





.. kernel-doc:: kernel/rcu/update.c

.. kernel-doc:: kernel/rcu/update.c

   :external:





.. kernel-doc:: include/linux/srcu.h

.. kernel-doc:: include/linux/srcu.h

   :external:





.. kernel-doc:: kernel/rcu/srcutree.c

.. kernel-doc:: kernel/rcu/srcutree.c

   :external:





.. kernel-doc:: include/linux/rculist_bl.h

.. kernel-doc:: include/linux/rculist_bl.h

   :external:





.. kernel-doc:: include/linux/rculist.h

.. kernel-doc:: include/linux/rculist.h

   :external:





.. kernel-doc:: include/linux/rculist_nulls.h

.. kernel-doc:: include/linux/rculist_nulls.h

   :external:





.. kernel-doc:: include/linux/rcu_sync.h

.. kernel-doc:: include/linux/rcu_sync.h

   :external:





.. kernel-doc:: kernel/rcu/sync.c

.. kernel-doc:: kernel/rcu/sync.c

   :external:

Documentation/devicetree/bindings/iio/proximity/as3935.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,10 @@ Optional properties: 
	- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping

	- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping

	  value 0 - 120pF. This will require using the calibration data from

	  value 0 - 120pF. This will require using the calibration data from

	  the manufacturer.

	  the manufacturer.

	- ams,nflwdth: Set the noise and watchdog threshold register on

	  startup. This will need to set according to the noise from the

	  MCU board, and possibly the local environment. Refer to the

	  datasheet for the threshold settings.





Example:

Example:
@@ -27,4 +31,5 @@ as3935@0 { 
	interrupt-parent = <&gpio1>;

	interrupt-parent = <&gpio1>;

	interrupts = <16 1>;

	interrupts = <16 1>;

	ams,tuning-capacitor-pf = <80>;

	ams,tuning-capacitor-pf = <80>;

	ams,nflwdth = <0x44>;

};
 
};