Merge branches 'ib-mfd-arm-i2c-4.14', 'ib-mfd-arm-usb-video-4.14',... (3f979bf8) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/sysfs-bus-iio-lptimer-stm32

0 → 100644

+57 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/iio/devices/iio:deviceX/in_count0_preset
			KernelVersion: 4.13
			Contact: fabrice.gasnier@st.com
			Description:
			Reading returns the current preset value. Writing sets the
			preset value. Encoder counts continuously from 0 to preset
			value, depending on direction (up/down).

			What: /sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available
			KernelVersion: 4.13
			Contact: fabrice.gasnier@st.com
			Description:
			Reading returns the list possible quadrature modes.

			What: /sys/bus/iio/devices/iio:deviceX/in_count0_quadrature_mode
			KernelVersion: 4.13
			Contact: fabrice.gasnier@st.com
			Description:
			Configure the device counter quadrature modes:
			- non-quadrature:
			Encoder IN1 input servers as the count input (up
			direction).
			- quadrature:
			Encoder IN1 and IN2 inputs are mixed to get direction
			and count.

			What: /sys/bus/iio/devices/iio:deviceX/in_count_polarity_available
			KernelVersion: 4.13
			Contact: fabrice.gasnier@st.com
			Description:
			Reading returns the list possible active edges.

			What: /sys/bus/iio/devices/iio:deviceX/in_count0_polarity
			KernelVersion: 4.13
			Contact: fabrice.gasnier@st.com
			Description:
			Configure the device encoder/counter active edge:
			- rising-edge
			- falling-edge
			- both-edges

			In non-quadrature mode, device counts up on active edge.
			In quadrature mode, encoder counting scenarios are as follows:
			----------------------------------------------------------------
			\| Active \| Level on \| IN1 signal \| IN2 signal \|
			\| edge \| opposite \|------------------------------------------
			\| \| signal \| Rising \| Falling \| Rising \| Falling \|
			----------------------------------------------------------------
			\| Rising \| High -> \| Down \| - \| Up \| - \|
			\| edge \| Low -> \| Up \| - \| Down \| - \|
			----------------------------------------------------------------
			\| Falling \| High -> \| - \| Up \| - \| Down \|
			\| edge \| Low -> \| - \| Down \| - \| Up \|
			----------------------------------------------------------------
			\| Both \| High -> \| Down \| Up \| Up \| Down \|
			\| edges \| Low -> \| Up \| Down \| Down \| Up \|
			----------------------------------------------------------------

Documentation/admin-guide/pm/cpufreq.rst

+8 −0

Original line number	Original line	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		This attribute is not present if the scaling driver in use does not
	support it.		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``		``cpuinfo_max_freq``
	Maximum possible operating frequency the CPUs belonging to this policy		Maximum possible operating frequency the CPUs belonging to this policy
	can run at (in kHz).		can run at (in kHz).

Documentation/device-mapper/dm-raid.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -343,3 +343,4 @@ Version History
	1.11.0 Fix table line argument order		1.11.0 Fix table line argument order
	(wrong raid10_copies/raid10_format sequence)		(wrong raid10_copies/raid10_format sequence)
	1.11.1 Add raid4/5/6 journal write-back support via journal_mode option		1.11.1 Add raid4/5/6 journal write-back support via journal_mode option
			1.12.1 fix for MD deadlock between mddev_suspend() and md_write_start() available

Documentation/devicetree/bindings/ata/sata_rcar.txt

+11 −3

Original line number	Original line	Diff line number	Diff line
	* Renesas R-Car SATA		* Renesas R-Car SATA

	Required properties:		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,sata-r8a7779" for R-Car H1
	("renesas,rcar-sata" is deprecated)
	- "renesas,sata-r8a7790-es1" for R-Car H2 ES1		- "renesas,sata-r8a7790-es1" for R-Car H2 ES1
	- "renesas,sata-r8a7790" for R-Car H2 other than ES1		- "renesas,sata-r8a7790" for R-Car H2 other than ES1
	- "renesas,sata-r8a7791" for R-Car M2-W		- "renesas,sata-r8a7791" for R-Car M2-W
	- "renesas,sata-r8a7793" for R-Car M2-N		- "renesas,sata-r8a7793" for R-Car M2-N
	- "renesas,sata-r8a7795" for R-Car H3		- "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;		- reg : address and length of the SATA registers;
	- interrupts : must consist of one interrupt specifier.		- interrupts : must consist of one interrupt specifier.
	- clocks : must contain a reference to the functional clock.		- clocks : must contain a reference to the functional clock.
	@@ -16,7 +24,7 @@ Required properties:
	Example:		Example:

	sata0: sata@ee300000 {		sata0: sata@ee300000 {
	compatible = "renesas,sata-r8a7791";		compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";
	reg = <0 0xee300000 0 0x2000>;		reg = <0 0xee300000 0 0x2000>;
	interrupt-parent = <&gic>;		interrupt-parent = <&gic>;
	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;		interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,6 @@ Required properties:

	Optional properties:		Optional properties:
	- clocks: Reference to the crypto engine clock.		- clocks: Reference to the crypto engine clock.
	- dma-mask: The address mask limitation. Defaults to 64.

	Example:		Example:

	@@ -24,6 +23,5 @@ Example:
	interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3",		interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3",
	"eip";		"eip";
	clocks = <&cpm_syscon0 1 26>;		clocks = <&cpm_syscon0 1 26>;
	dma-mask = <0xff 0xffffffff>;
	status = "disabled";		status = "disabled";
	};		};