Merge branch 'for-davem' into for-next (39c853eb) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/ABI/testing/sysfs-class-net

+8 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,14 @@ Description:
		Indicates the interface unique physical port identifier within
		the NIC, as a string.

		What: /sys/class/net/<iface>/phys_port_name
		Date: March 2015
		KernelVersion: 4.0
		Contact: netdev@vger.kernel.org
		Description:
		Indicates the interface physical port name within the NIC,
		as a string.

		What: /sys/class/net/<iface>/speed
		Date: October 2009
		KernelVersion: 2.6.33

+8 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,14 @@ Description:
		Indicates the number of transmit timeout events seen by this
		network interface transmit queue.

		What: /sys/class/<iface>/queues/tx-<queue>/tx_maxrate
		Date: March 2015
		KernelVersion: 4.1
		Contact: netdev@vger.kernel.org
		Description:
		A Mbps max-rate set for the queue, a value of zero means disabled,
		default is disabled.

		What: /sys/class/<iface>/queues/tx-<queue>/xps_cpus
		Date: November 2010
		KernelVersion: 2.6.38

+6 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,11 @@ Required properties for all the ethernet interfaces:
		- "enet_csr": Ethernet control and status register address space
		- "ring_csr": Descriptor ring control and status register address space
		- "ring_cmd": Descriptor ring command register address space
		- interrupts: Ethernet main interrupt
		- interrupts: Two interrupt specifiers can be specified.
		- First is the Rx interrupt. This irq is mandatory.
		- Second is the Tx completion interrupt.
		This is supported only on SGMII based 1GbE and 10GbE interfaces.
		- port-id: Port number (0 or 1)
		- clocks: Reference to the clock entry.
		- local-mac-address: MAC address assigned to this device
		- phy-connection-type: Interface type between ethernet device and PHY device
		@@ -49,6 +53,7 @@ Example:
		<0x0 0X10000000 0x0 0X200>;
		reg-names = "enet_csr", "ring_csr", "ring_cmd";
		interrupts = <0x0 0x3c 0x4>;
		port-id = <0>;
		clocks = <&menetclk 0>;
		local-mac-address = [00 01 73 00 00 01];
		phy-connection-type = "rgmii";

+3 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,9 @@ the parent DSA node. The maximum number of allowed child nodes is 4
		(DSA_MAX_SWITCHES).
		Each of these switch child nodes should have the following required properties:

		- reg : Describes the switch address on the MII bus
		- reg : Contains two fields. The first one describes the
		address on the MII bus. The second is the switch
		number that must be unique in cascaded configurations
		- #address-cells : Must be 1
		- #size-cells : Must be 0

+6 −2

Original line number	Diff line number	Diff line
		@@ -6,11 +6,14 @@ Required properties:
		- spi-max-frequency: maximal bus speed, should be set to 7500000 depends
		sync or async operation mode
		- reg: the chipselect index
		- interrupts: the interrupt generated by the device
		- interrupts: the interrupt generated by the device. Non high-level
		can occur deadlocks while handling isr.

		Optional properties:
		- reset-gpio: GPIO spec for the rstn pin
		- sleep-gpio: GPIO spec for the slp_tr pin
		- xtal-trim: u8 value for fine tuning the internal capacitance
		arrays of xtal pins: 0 = +0 pF, 0xf = +4.5 pF

		Example:

		@@ -18,6 +21,7 @@ Example:
		compatible = "atmel,at86rf231";
		spi-max-frequency = <7500000>;
		reg = <0>;
		interrupts = <19 1>;
		interrupts = <19 4>;
		interrupt-parent = <&gpio3>;
		xtal-trim = /bits/ 8 <0x06>;
		};