Merge branch 'linus' into irq/core (e50226b4) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/Changes

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ o udev 081 # udevd --version
		o grub 0.93 # grub --version \|\| grub-install --version
		o mcelog 0.6 # mcelog --version
		o iptables 1.4.2 # iptables -V
		o openssl & libcrypto 1.0.1k # openssl version
		o openssl & libcrypto 1.0.0 # openssl version


		Kernel compilation

+7 −3

Original line number	Diff line number	Diff line
		@@ -41,9 +41,13 @@ useless and be disabled, returning errors. So it is important to monitor
		the amount of free space and expand the <COW device> before it fills up.

		<persistent?> is P (Persistent) or N (Not persistent - will not survive
		after reboot).
		The difference is that for transient snapshots less metadata must be
		saved on disk - they can be kept in memory by the kernel.
		after reboot). O (Overflow) can be added as a persistent store option
		to allow userspace to advertise its support for seeing "Overflow" in the
		snapshot status. So supported store types are "P", "PO" and "N".

		The difference between persistent and transient is with transient
		snapshots less metadata must be saved on disk - they can be kept in
		memory by the kernel.


		* snapshot-merge <origin> <COW device> <persistent> <chunksize>

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ Example:
		/* Cypress Gen3 touchpad */
		touchpad@67 {
		compatible = "cypress,cyapa";
		reg = <0x24>;
		reg = <0x67>;
		interrupt-parent = <&gpio>;
		interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO 2 */
		wakeup-source;

+18 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,8 @@ The MISC interrupt controller is a secondary controller for lower priority
		interrupt.

		Required Properties:
		- compatible: has to be "qca,<soctype>-cpu-intc", "qca,ar7100-misc-intc"
		as fallback
		- compatible: has to be "qca,<soctype>-cpu-intc", "qca,ar7100-misc-intc" or
		"qca,<soctype>-cpu-intc", "qca,ar7240-misc-intc"
		- reg: Base address and size of the controllers memory area
		- interrupt-parent: phandle of the parent interrupt controller.
		- interrupts: Interrupt specifier for the controllers interrupt.
		@@ -13,6 +13,9 @@ Required Properties:
		- #interrupt-cells : Specifies the number of cells needed to encode interrupt
		source, should be 1

		Compatible fallback depends on the SoC. Use ar7100 for ar71xx and ar913x,
		use ar7240 for all other SoCs.

		Please refer to interrupts.txt in this directory for details of the common
		Interrupt Controllers bindings used by client devices.

		@@ -28,3 +31,16 @@ Example:
		interrupt-controller;
		#interrupt-cells = <1>;
		};

		Another example:

		interrupt-controller@18060010 {
		compatible = "qca,ar9331-misc-intc", qca,ar7240-misc-intc";
		reg = <0x18060010 0x4>;

		interrupt-parent = <&cpuintc>;
		interrupts = <6>;

		interrupt-controller;
		#interrupt-cells = <1>;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings:
		- renesas,tx-fifo-size : Overrides the default tx fifo size given in words
		(default is 64)
		- renesas,rx-fifo-size : Overrides the default rx fifo size given in words
		(default is 64, or 256 on R-Car Gen2)
		(default is 64)

		Pinctrl properties might be needed, too. See
		Documentation/devicetree/bindings/pinctrl/renesas,*.