diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:29:36 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 10:29:36 -0700 |
commit | 4970c0cb6aa8996e39b1626887f5fb67a49f5ad1 (patch) | |
tree | 8e734bdf15768744a0ec03fbc715a6404a4f732b /Documentation/devicetree/bindings/spi/sh-msiof.txt | |
parent | 3c0ed7d56d77b61f2177e8b72855ea32073c2091 (diff) | |
parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
download | op-kernel-dev-4970c0cb6aa8996e39b1626887f5fb67a49f5ad1.zip op-kernel-dev-4970c0cb6aa8996e39b1626887f5fb67a49f5ad1.tar.gz |
Merge 4.3-rc5 into char-misc next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/spi/sh-msiof.txt')
-rw-r--r-- | Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt index 8f77144..705075d 100644 --- a/Documentation/devicetree/bindings/spi/sh-msiof.txt +++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt @@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings: - renesas,tx-fifo-size : Overrides the default tx fifo size given in words (default is 64) - renesas,rx-fifo-size : Overrides the default rx fifo size given in words - (default is 64, or 256 on R-Car Gen2) + (default is 64) Pinctrl properties might be needed, too. See Documentation/devicetree/bindings/pinctrl/renesas,*. |