forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
We need the char/misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
- Loading branch information
Showing
835 changed files
with
9,968 additions
and
4,782 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -82,7 +82,10 @@ Dengcheng Zhu <[email protected]> <[email protected]> | |
Dengcheng Zhu <[email protected]> <[email protected]> | ||
Dengcheng Zhu <[email protected]> <[email protected]> | ||
<[email protected]> <[email protected]> | ||
Dmitry Eremin-Solenikov <[email protected]> | ||
Dmitry Baryshkov <[email protected]> | ||
Dmitry Baryshkov <[email protected]> <[[email protected]]> | ||
Dmitry Baryshkov <[email protected]> <[email protected]> | ||
Dmitry Baryshkov <[email protected]> <[email protected]> | ||
Dmitry Safonov <[email protected]> <[email protected]> | ||
Dmitry Safonov <[email protected]> <[email protected]> | ||
Dmitry Safonov <[email protected]> <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,29 @@ | ||
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap | ||
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap | ||
Date: December 3, 2009 | ||
KernelVersion: 2.6.32 | ||
Contact: [email protected] | ||
Description: Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL, | ||
DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT. | ||
|
||
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active | ||
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active | ||
Date: December 3, 2009 | ||
KernelVersion: 2.6.32 | ||
Contact: [email protected] | ||
Description: The number of descriptors active in the ring. | ||
|
||
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size | ||
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size | ||
Date: December 3, 2009 | ||
KernelVersion: 2.6.32 | ||
Contact: [email protected] | ||
Description: Descriptor ring size, total number of descriptors available. | ||
|
||
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version | ||
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version | ||
Date: December 3, 2009 | ||
KernelVersion: 2.6.32 | ||
Contact: [email protected] | ||
Description: Version of ioatdma device. | ||
|
||
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce | ||
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce | ||
Date: August 8, 2017 | ||
KernelVersion: 4.14 | ||
Contact: [email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -152,7 +152,7 @@ Description: | |
When an interface is under test, it cannot be expected | ||
to pass packets as normal. | ||
|
||
What: /sys/clas/net/<iface>/duplex | ||
What: /sys/class/net/<iface>/duplex | ||
Date: October 2009 | ||
KernelVersion: 2.6.33 | ||
Contact: [email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
Documentation/devicetree/bindings/net/can/can-controller.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/net/can/can-controller.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: CAN Controller Generic Binding | ||
|
||
maintainers: | ||
- Marc Kleine-Budde <[email protected]> | ||
|
||
properties: | ||
$nodename: | ||
pattern: "^can(@.*)?$" | ||
|
||
additionalProperties: true | ||
|
||
... |
139 changes: 139 additions & 0 deletions
139
Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/net/can/fsl,flexcan.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: | ||
Flexcan CAN controller on Freescale's ARM and PowerPC system-on-a-chip (SOC). | ||
|
||
maintainers: | ||
- Marc Kleine-Budde <[email protected]> | ||
|
||
allOf: | ||
- $ref: can-controller.yaml# | ||
|
||
properties: | ||
compatible: | ||
oneOf: | ||
- enum: | ||
- fsl,imx8qm-flexcan | ||
- fsl,imx8mp-flexcan | ||
- fsl,imx6q-flexcan | ||
- fsl,imx28-flexcan | ||
- fsl,imx25-flexcan | ||
- fsl,p1010-flexcan | ||
- fsl,vf610-flexcan | ||
- fsl,ls1021ar2-flexcan | ||
- fsl,lx2160ar1-flexcan | ||
- items: | ||
- enum: | ||
- fsl,imx53-flexcan | ||
- fsl,imx35-flexcan | ||
- const: fsl,imx25-flexcan | ||
- items: | ||
- enum: | ||
- fsl,imx7d-flexcan | ||
- fsl,imx6ul-flexcan | ||
- fsl,imx6sx-flexcan | ||
- const: fsl,imx6q-flexcan | ||
- items: | ||
- enum: | ||
- fsl,ls1028ar1-flexcan | ||
- const: fsl,lx2160ar1-flexcan | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 2 | ||
|
||
clock-names: | ||
items: | ||
- const: ipg | ||
- const: per | ||
|
||
clock-frequency: | ||
description: | | ||
The oscillator frequency driving the flexcan device, filled in by the | ||
boot loader. This property should only be used the used operating system | ||
doesn't support the clocks and clock-names property. | ||
xceiver-supply: | ||
description: Regulator that powers the CAN transceiver. | ||
|
||
big-endian: | ||
$ref: /schemas/types.yaml#/definitions/flag | ||
description: | | ||
This means the registers of FlexCAN controller are big endian. This is | ||
optional property.i.e. if this property is not present in device tree | ||
node then controller is assumed to be little endian. If this property is | ||
present then controller is assumed to be big endian. | ||
fsl,stop-mode: | ||
description: | | ||
Register bits of stop mode control. | ||
The format should be as follows: | ||
<gpr req_gpr req_bit> | ||
gpr is the phandle to general purpose register node. | ||
req_gpr is the gpr register offset of CAN stop request. | ||
req_bit is the bit offset of CAN stop request. | ||
$ref: /schemas/types.yaml#/definitions/phandle-array | ||
items: | ||
items: | ||
- description: The 'gpr' is the phandle to general purpose register node. | ||
- description: The 'req_gpr' is the gpr register offset of CAN stop request. | ||
maximum: 0xff | ||
- description: The 'req_bit' is the bit offset of CAN stop request. | ||
maximum: 0x1f | ||
|
||
fsl,clk-source: | ||
description: | | ||
Select the clock source to the CAN Protocol Engine (PE). It's SoC | ||
implementation dependent. Refer to RM for detailed definition. If this | ||
property is not set in device tree node then driver selects clock source 1 | ||
by default. | ||
0: clock source 0 (oscillator clock) | ||
1: clock source 1 (peripheral clock) | ||
$ref: /schemas/types.yaml#/definitions/uint32 | ||
default: 1 | ||
minimum: 0 | ||
maximum: 1 | ||
|
||
wakeup-source: | ||
$ref: /schemas/types.yaml#/definitions/flag | ||
description: | ||
Enable CAN remote wakeup. | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
can@1c000 { | ||
compatible = "fsl,p1010-flexcan"; | ||
reg = <0x1c000 0x1000>; | ||
interrupts = <48 0x2>; | ||
interrupt-parent = <&mpic>; | ||
clock-frequency = <200000000>; | ||
fsl,clk-source = <0>; | ||
}; | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
can@2090000 { | ||
compatible = "fsl,imx6q-flexcan"; | ||
reg = <0x02090000 0x4000>; | ||
interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>; | ||
clocks = <&clks 1>, <&clks 2>; | ||
clock-names = "ipg", "per"; | ||
fsl,stop-mode = <&gpr 0x34 28>; | ||
}; |
Oops, something went wrong.