Merge tag 'at24-4.17-updates-for-wolfram' of... (0b884c22) · Commits · 戴 / test

Documentation/PCI/pci.txt

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants.
	The device IDs are arbitrary hex numbers (vendor controlled) and normally used		The device IDs are arbitrary hex numbers (vendor controlled) and normally used
	only in a single location, the pci_device_id table.		only in a single location, the pci_device_id table.

	Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.		Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.
			There are mirrors of the pci.ids file at http://pciids.sourceforge.net/
			and https://github.com/pciutils/pciids.

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -152,6 +152,11 @@ OCXL_IOCTL_IRQ_SET_FD:
	Associate an event fd to an AFU interrupt so that the user process		Associate an event fd to an AFU interrupt so that the user process
	can be notified when the AFU sends an interrupt.		can be notified when the AFU sends an interrupt.

			OCXL_IOCTL_GET_METADATA:

			Obtains configuration information from the card, such at the size of
			MMIO areas, the AFU version, and the PASID for the current context.


	mmap		mmap
	----		----

+0 −0

File moved.

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11,7 +11,11 @@ Required properties:
	interrupts.		interrupts.

	Optional properties:		Optional properties:
	- clocks: Optional reference to the clock used by the XOR engine.		- clocks: Optional reference to the clocks used by the XOR engine.
			- clock-names: mandatory if there is a second clock, in this case the
			name must be "core" for the first clock and "reg" for the second
			one


	Example:		Example:

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,15 +38,19 @@ Required properties:

	"catalyst",		"catalyst",
	"microchip",		"microchip",
			"nxp",
	"ramtron",		"ramtron",
	"renesas",		"renesas",
	"nxp",		"rohm",
	"st",		"st",

	Some vendors use different model names for chips which are just		Some vendors use different model names for chips which are just
	variants of the above. Known such exceptions are listed below:		variants of the above. Known such exceptions are listed below:

			"nxp,se97b" - the fallback is "atmel,24c02",
	"renesas,r1ex24002" - the fallback is "atmel,24c02"		"renesas,r1ex24002" - the fallback is "atmel,24c02"
			"renesas,r1ex24128" - the fallback is "atmel,24c128"
			"rohm,br24t01" - the fallback is "atmel,24c01"

	- reg: The I2C address of the EEPROM.		- reg: The I2C address of the EEPROM.