Merge 4.14-rc6 into staging-next (7706abf5) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,3 +14,11 @@ Description:
		Show or set the gain boost of the amp, from 0-31 range.
		18 = indoors (default)
		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

+0 −10

Original line number	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
		false, the global swap readahead algorithm will be
		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.

+0 −14

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@ Optional properties:
		- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping
		value 0 - 120pF. This will require using the calibration data from
		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:

		@@ -27,4 +31,5 @@ as3935@0 {
		interrupt-parent = <&gpio1>;
		interrupts = <16 1>;
		ams,tuning-capacitor-pf = <80>;
		ams,nflwdth = <0x44>;
		};

+3 −3