diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2021-05-04 14:54:19 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2021-05-05 23:03:56 +0200 |
| commit | a08f3c7add53eaaa4ab453ac3f06c24ec8927579 (patch) | |
| tree | d0d794479622b8054d0ae746a5dff0524cfe472c /Documentation/devicetree | |
| parent | 82e97870feb6303ecc71371abc76a606e724b065 (diff) | |
| parent | 28910e01c43d9735f06fddbeaa42df3e112d1b3e (diff) | |
Merge commit '28910e01c43d9735f06fddbeaa42df3e112d1b3e' into toradex_5.4-2.3.x-imx
This basically contains NXP BSP Patch L5.4.70_2.3.2 plus kernel.org
v5.4.115 from https://github.com/Freescale/linux-fslc/tree/5.4-2.3.x-imx.
Related-to: ELB-3958
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'Documentation/devicetree')
3 files changed, 18 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/btusb.txt b/Documentation/devicetree/bindings/net/btusb.txt index b1ad6ee68e90..c51dd99dc0d3 100644 --- a/Documentation/devicetree/bindings/net/btusb.txt +++ b/Documentation/devicetree/bindings/net/btusb.txt @@ -38,7 +38,7 @@ Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt: compatible = "usb1286,204e"; reg = <1>; interrupt-parent = <&gpio0>; - interrupt-name = "wakeup"; + interrupt-names = "wakeup"; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; }; }; diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml index 0bac41cc7ba1..b986a395a6af 100644 --- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml @@ -60,7 +60,7 @@ properties: description: Reference to an nvmem node for the MAC address - nvmem-cells-names: + nvmem-cell-names: const: mac-address nvmem_macaddr_swap: @@ -204,6 +204,11 @@ properties: Indicates that full-duplex is used. When absent, half duplex is assumed. + pause: + $ref: /schemas/types.yaml#definitions/flag + description: + Indicates that pause should be enabled. + asym-pause: $ref: /schemas/types.yaml#definitions/flag description: diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt index 09326ffaee52..8a4edaf2cee1 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt @@ -51,6 +51,9 @@ Optional properties: The regulator will be enabled when initializing the PCIe host and disabled either as part of the init process or when shutting down the host. +- vph-supply: Should specify the regulator in charge of VPH one of the three + PCIe PHY powers. This regulator can be supplied by both 1.8v and 3.3v voltage + supplies. Might be used to distinguish different HW board designs. - ext_osc: use the external oscillator as ref clock( 1: external OSC is used, 0 internal PLL is used). - hard_wired: the PCIe port is hard wired to the EP device(0: one slot @@ -60,6 +63,9 @@ Optional properties: - interrupt-names: Optional include the following entries: - "dma": The interrupt that is asserted when an DMA interrupter is received +- l1ss-disabled: Force to disable L1SS or not. If present then the L1 + substate would be force disabled although it might be supported by the + chip. Additional required properties for imx6sx-pcie: - clock names: Must include the following additional entries: @@ -83,6 +89,11 @@ Additional required properties for imx8mq-pcie: - clock-names: Must include the following additional entries: - "pcie_aux" +Additional required properties to enable L1sub for imx8mq-pcie, imx8mm-pcie +and imx8mp-pcie: +- reset-names: Must contain the following entries: + - "clkreq" + Additional required properties for imx8 pcie: - hsio-cfg: hsio configration mode when the pcie node is supported. mode 1: pciea 2 lanes and one sata ahci port. |