Commit b80d6c78 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued 



Conflicts:
	drivers/gpu/drm/i915/intel_dp.c

A bit a mess with reverts which differe in details between -fixes and
-next and some other unrelated shuffling.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 262ca2b0 0b99836f

Documentation/DocBook/drm.tmpl

+326 −174

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/drm/i2c/tda998x.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Device-Tree bindings for the NXP TDA998x HDMI transmitter



Required properties;

  - compatible: must be "nxp,tda998x"



Optional properties:

  - interrupts: interrupt number and trigger type

	default: polling



  - pinctrl-0: pin control group to be used for

	screen plug/unplug interrupt.



  - pinctrl-names: must contain a "default" entry.



  - video-ports: 24 bits value which defines how the video controller

	output is wired to the TDA998x input - default: <0x230145>



Example:



	tda998x: hdmi-encoder {

		compatible = "nxp,tda998x";

		reg = <0x70>;

		interrupt-parent = <&gpio0>;

		interrupts = <27 2>;		/* falling edge */

		pinctrl-0 = <&pmx_camera>;

		pinctrl-names = "default";

	};

Documentation/networking/packet_mmap.txt

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ TP_STATUS_COPY : This flag indicates that the frame (and associated 
                        enabled previously with setsockopt() and 

                        the PACKET_COPY_THRESH option. 



                        The number of frames than can be buffered to 

                        The number of frames that can be buffered to

                        be read with recvfrom is limited like a normal socket.

                        See the SO_RCVBUF option in the socket (7) man page.

Documentation/networking/timestamping.txt

+32 −20
Original line number Diff line number Diff line
@@ -21,26 +21,38 @@ has such a feature). 


SO_TIMESTAMPING:



Instructs the socket layer which kind of information is wanted. The

parameter is an integer with some of the following bits set. Setting

other bits is an error and doesn't change the current state.



SOF_TIMESTAMPING_TX_HARDWARE:  try to obtain send time stamp in hardware

SOF_TIMESTAMPING_TX_SOFTWARE:  if SOF_TIMESTAMPING_TX_HARDWARE is off or

                               fails, then do it in software

SOF_TIMESTAMPING_RX_HARDWARE:  return the original, unmodified time stamp

                               as generated by the hardware

SOF_TIMESTAMPING_RX_SOFTWARE:  if SOF_TIMESTAMPING_RX_HARDWARE is off or

                               fails, then do it in software

SOF_TIMESTAMPING_RAW_HARDWARE: return original raw hardware time stamp

SOF_TIMESTAMPING_SYS_HARDWARE: return hardware time stamp transformed to

                               the system time base

SOF_TIMESTAMPING_SOFTWARE:     return system time stamp generated in

                               software



SOF_TIMESTAMPING_TX/RX determine how time stamps are generated.

SOF_TIMESTAMPING_RAW/SYS determine how they are reported in the

following control message:

Instructs the socket layer which kind of information should be collected

and/or reported.  The parameter is an integer with some of the following

bits set. Setting other bits is an error and doesn't change the current

state.



Four of the bits are requests to the stack to try to generate

timestamps.  Any combination of them is valid.



SOF_TIMESTAMPING_TX_HARDWARE:  try to obtain send time stamps in hardware

SOF_TIMESTAMPING_TX_SOFTWARE:  try to obtain send time stamps in software

SOF_TIMESTAMPING_RX_HARDWARE:  try to obtain receive time stamps in hardware

SOF_TIMESTAMPING_RX_SOFTWARE:  try to obtain receive time stamps in software



The other three bits control which timestamps will be reported in a

generated control message.  If none of these bits are set or if none of

the set bits correspond to data that is available, then the control

message will not be generated:



SOF_TIMESTAMPING_SOFTWARE:     report systime if available

SOF_TIMESTAMPING_SYS_HARDWARE: report hwtimetrans if available

SOF_TIMESTAMPING_RAW_HARDWARE: report hwtimeraw if available



It is worth noting that timestamps may be collected for reasons other

than being requested by a particular socket with

SOF_TIMESTAMPING_[TR]X_(HARD|SOFT)WARE.  For example, most drivers that

can generate hardware receive timestamps ignore

SOF_TIMESTAMPING_RX_HARDWARE.  It is still a good idea to set that flag

in case future drivers pay attention.



If timestamps are reported, they will appear in a control message with

cmsg_level==SOL_SOCKET, cmsg_type==SO_TIMESTAMPING, and a payload like

this:



struct scm_timestamping {

	struct timespec systime;

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -1738,6 +1738,7 @@ F: include/uapi/linux/bfs_fs.h 
BLACKFIN ARCHITECTURE

M:	Steven Miao <realmz6@gmail.com>

L:	adi-buildroot-devel@lists.sourceforge.net

T:	git git://git.code.sf.net/p/adi-linux/code

W:	http://blackfin.uclinux.org

S:	Supported

F:	arch/blackfin/
@@ -6002,6 +6003,8 @@ F: include/linux/netdevice.h 
F:	include/uapi/linux/in.h

F:	include/uapi/linux/net.h

F:	include/uapi/linux/netdevice.h

F:	tools/net/

F:	tools/testing/selftests/net/



NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>