Merge 8ff6c4c37245a63d0f51c2f8acb8895706e6408e on remote branch (35abd15b) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/media/kapi/cec-core.rst

+18 −0

Original line number	Diff line number	Diff line
		@@ -194,6 +194,11 @@ When a transmit finished (successfully or otherwise):
		void cec_transmit_done(struct cec_adapter *adap, u8 status, u8 arb_lost_cnt,
		u8 nack_cnt, u8 low_drive_cnt, u8 error_cnt);

		or:

		.. c:function::
		void cec_transmit_attempt_done(struct cec_adapter *adap, u8 status);

		The status can be one of:

		CEC_TX_STATUS_OK:
		@@ -231,6 +236,11 @@ to 1, if the hardware does support retry then either set these counters to
		0 if the hardware provides no feedback of which errors occurred and how many
		times, or fill in the correct values as reported by the hardware.

		The cec_transmit_attempt_done() function is a helper for cases where the
		hardware never retries, so the transmit is always for just a single
		attempt. It will call cec_transmit_done() in turn, filling in 1 for the
		count argument corresponding to the status. Or all 0 if the status was OK.

		When a CEC message was received:

		.. c:function::
		@@ -294,6 +304,14 @@ then the CEC adapter will be disabled. If you change a valid physical address
		to another valid physical address, then this function will first set the
		address to CEC_PHYS_ADDR_INVALID before enabling the new physical address.

		.. c:function::
		void cec_s_phys_addr_from_edid(struct cec_adapter *adap,
		const struct edid *edid);

		A helper function that extracts the physical address from the edid struct
		and calls cec_s_phys_addr() with that address, or CEC_PHYS_ADDR_INVALID
		if the EDID did not contain a physical address or edid was a NULL pointer.

		.. c:function::
		int cec_s_log_addrs(struct cec_adapter *adap,
		struct cec_log_addrs *log_addrs, bool block);

Documentation/networking/l2tp.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -177,10 +177,10 @@ setsockopt on the PPPoX socket to set a debug mask.

		The following debug mask bits are available:

		PPPOL2TP_MSG_DEBUG verbose debug (if compiled in)
		PPPOL2TP_MSG_CONTROL userspace - kernel interface
		PPPOL2TP_MSG_SEQ sequence numbers handling
		PPPOL2TP_MSG_DATA data packets
		L2TP_MSG_DEBUG verbose debug (if compiled in)
		L2TP_MSG_CONTROL userspace - kernel interface
		L2TP_MSG_SEQ sequence numbers handling
		L2TP_MSG_DATA data packets

		If enabled, files under a l2tp debugfs directory can be used to dump
		kernel state about L2TP tunnels and sessions. To access it, the

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 224
		SUBLEVEL = 226
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arm/boot/dts/imx6q-b450v3.dts

+0 −7

Original line number	Diff line number	Diff line
		@@ -65,13 +65,6 @@
		};
		};

		&clks {
		assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
		<&clks IMX6QDL_CLK_LDB_DI1_SEL>;
		assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
		<&clks IMX6QDL_CLK_PLL3_USB_OTG>;
		};

		&ldb {
		status = "okay";

arch/arm/boot/dts/imx6q-b650v3.dts

+0 −7

Original line number	Diff line number	Diff line
		@@ -65,13 +65,6 @@
		};
		};

		&clks {
		assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
		<&clks IMX6QDL_CLK_LDB_DI1_SEL>;
		assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
		<&clks IMX6QDL_CLK_PLL3_USB_OTG>;
		};

		&ldb {
		status = "okay";