diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:01:58 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:01:58 +0800 |
| commit | f7bb9c8545061e277f83d1ca99ef12b72ab6ac50 (patch) | |
| tree | ebe55bddf0815ce80c42728f0ea5452d188c7bb0 /Documentation/devicetree/bindings/spi | |
| parent | 3cd5af855f3d12451a634d3d871f6a1c8ab39096 (diff) | |
| parent | 021427a7b0af87dd7e416f1b75de02ad701c9e20 (diff) | |
Merge remote-tracking branch 'origin/spi/qspi' into spi/next
* origin/spi/qspi:
spi: spi-fsl-qspi: Introduce variable to fix different invalid master Id
dt-bindings: spi: spi-fsl-qspi: Add bindings of ls1088a and ls1012a
spi: spi-fsl-qspi: dynamically alloc AHB memory for QSPI
Diffstat (limited to 'Documentation/devicetree/bindings/spi')
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-fsl-qspi.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-fsl-qspi.txt b/Documentation/devicetree/bindings/spi/spi-fsl-qspi.txt index 69dc5d57b1ef..7ba0472170e1 100644 --- a/Documentation/devicetree/bindings/spi/spi-fsl-qspi.txt +++ b/Documentation/devicetree/bindings/spi/spi-fsl-qspi.txt @@ -6,6 +6,8 @@ Required properties: "fsl,ls1021a-qspi", "fsl,ls2080a-qspi" or "fsl,ls1043a-qspi" followed by "fsl,ls1021a-qspi" + "fsl,ls1012a-qspi" followed by "fsl,ls1021a-qspi" + "fsl,ls1088a-qspi" followed by "fsl,ls2080a-qspi" - reg : the first contains the register location and length, the second contains the memory mapping address and length - reg-names: Should contain the reg names "QuadSPI" and "QuadSPI-memory" |