Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceedd5f7 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge tag 'v5.2-rc6' into generic-dma-ops

Linux 5.2-rc6
parents 1b961423 4b972a01
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman <greg@kroah.com>
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
Henk Vergonet <Henk.Vergonet@gmail.com>
Henrik Kretzschmar <henne@nachtwindheim.de>
Henrik Rydberg <rydberg@bitmath.org>
@@ -238,6 +239,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Will Deacon <will@kernel.org> <will.deacon@arm.com>
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
Yusuke Goda <goda.yusuke@renesas.com>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
+8 −0
Original line number Diff line number Diff line
@@ -3364,6 +3364,14 @@ S: Braunschweiger Strasse 79
S: 31134 Hildesheim
S: Germany

N: Martin Schwidefsky
D: Martin was the most significant contributor to the initial s390
D: port of the Linux Kernel and later the maintainer of the s390
D: architecture backend for almost two decades.
D: He passed away in 2019, and will be greatly missed.
S: Germany
W: https://lwn.net/Articles/789028/

N: Marcel Selhorst
E: tpmdd@selhorst.net
D: TPM driver
+0 −29
Original line number Diff line number Diff line
What:		/sys/bus/mdio_bus/devices/.../phy_id
Date:		November 2012
KernelVersion:	3.8
Contact:	netdev@vger.kernel.org
Description:
		This attribute contains the 32-bit PHY Identifier as reported
		by the device during bus enumeration, encoded in hexadecimal.
		This ID is used to match the device with the appropriate
		driver.

What:		/sys/bus/mdio_bus/devices/.../phy_interface
Date:		February 2014
KernelVersion:	3.15
Contact:	netdev@vger.kernel.org
Description:
		This attribute contains the PHY interface as configured by the
		Ethernet driver during bus enumeration, encoded in string.
		This interface mode is used to configure the Ethernet MAC with the
		appropriate mode for its data lines to the PHY hardware.

What:		/sys/bus/mdio_bus/devices/.../phy_has_fixups
Date:		February 2014
KernelVersion:	3.15
Contact:	netdev@vger.kernel.org
Description:
		This attribute contains the boolean value whether a given PHY
		device has had any "fixup" workaround running on it, encoded as
		a boolean. This information is provided to help troubleshooting
		PHY configurations.
+11 −11
Original line number Diff line number Diff line
What:		/sys/bus/siox/devices/siox-X/active
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		On reading represents the current state of the bus. If it
		contains a "0" the bus is stopped and connected devices are
@@ -12,7 +12,7 @@ Description:

What:		/sys/bus/siox/devices/siox-X/device_add
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Write-only file. Write

@@ -27,13 +27,13 @@ Description:

What:		/sys/bus/siox/devices/siox-X/device_remove
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Write-only file. A single write removes the last device in the siox chain.

What:		/sys/bus/siox/devices/siox-X/poll_interval_ns
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Defines the interval between two poll cycles in nano seconds.
		Note this is rounded to jiffies on writing. On reading the current value
@@ -41,33 +41,33 @@ Description:

What:		/sys/bus/siox/devices/siox-X-Y/connected
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.
		communication with it is not ensured. "1" signals a working connection.

What:		/sys/bus/siox/devices/siox-X-Y/inbytes
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Read-only value reporting the inbytes value provided to siox-X/device_add

What:		/sys/bus/siox/devices/siox-X-Y/status_errors
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Counts the number of time intervals when the read status byte doesn't yield the
		expected value.

What:		/sys/bus/siox/devices/siox-X-Y/type
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Read-only value reporting the type value provided to siox-X/device_add.

What:		/sys/bus/siox/devices/siox-X-Y/watchdog
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Read-only value reporting if the watchdog of the siox device is
		active. "0" means the watchdog is not active and the device is expected to
@@ -75,13 +75,13 @@ Description:

What:		/sys/bus/siox/devices/siox-X-Y/watchdog_errors
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Read-only value reporting the number to time intervals when the
		watchdog was active.

What:		/sys/bus/siox/devices/siox-X-Y/outbytes
KernelVersion:	4.16
Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Description:
		Read-only value reporting the outbytes value provided to siox-X/device_add.
+13 −6
Original line number Diff line number Diff line
@@ -11,24 +11,31 @@ Date: February 2014
KernelVersion:	3.15
Contact:	netdev@vger.kernel.org
Description:
		Boolean value indicating whether the PHY device has
		any fixups registered against it (phy_register_fixup)
		This attribute contains the boolean value whether a given PHY
		device has had any "fixup" workaround running on it, encoded as
		a boolean. This information is provided to help troubleshooting
		PHY configurations.

What:		/sys/class/mdio_bus/<bus>/<device>/phy_id
Date:		November 2012
KernelVersion:	3.8
Contact:	netdev@vger.kernel.org
Description:
		32-bit hexadecimal value corresponding to the PHY device's OUI,
		model and revision number.
		This attribute contains the 32-bit PHY Identifier as reported
		by the device during bus enumeration, encoded in hexadecimal.
		This ID is used to match the device with the appropriate
		driver.

What:		/sys/class/mdio_bus/<bus>/<device>/phy_interface
Date:		February 2014
KernelVersion:	3.15
Contact:	netdev@vger.kernel.org
Description:
		String value indicating the PHY interface, possible
		values are:.
		This attribute contains the PHY interface as configured by the
		Ethernet driver during bus enumeration, encoded in string.
		This interface mode is used to configure the Ethernet MAC with the
		appropriate mode for its data lines to the PHY hardware.
		Possible values are:
		<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
		rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
		xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,
Loading